Commit graph

21718 commits

Author SHA1 Message Date
Daniel Rosenberg
f80d64f9d1 Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2 am: 20bf84e am: 0b35da7 am: 945228b am: aa7db31 am: cebac70 am: 5e7d964
am: 251e360

* commit '251e3609a485950de59d3aef08959f24a81f9e65':
  Fix overflow in path building

Change-Id: Icd03d8477acf5cd30fd034ed50deba6f1ee7a361
2016-04-14 20:01:24 +00:00
Daniel Rosenberg
251e3609a4 Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2 am: 20bf84e am: 0b35da7 am: 945228b am: aa7db31 am: cebac70
am: 5e7d964

* commit '5e7d964871fe7217bc9042adc181232a4e3c1f38':
  Fix overflow in path building

Change-Id: I2318464de6db3c058022f042c57840124f72a5e8
2016-04-14 19:58:14 +00:00
Daniel Rosenberg
5e7d964871 Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2 am: 20bf84e am: 0b35da7 am: 945228b am: aa7db31
am: cebac70

* commit 'cebac700aa133744b2b0b586d71d38d7de64f45a':
  Fix overflow in path building

Change-Id: I4d15a213045eb9293638ed1bafcb3137c7994fce
2016-04-14 19:54:47 +00:00
Daniel Rosenberg
cebac700aa Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2 am: 20bf84e am: 0b35da7 am: 945228b
am: aa7db31

* commit 'aa7db31fbd39d90e387b71c41e87a0d37b98882c':
  Fix overflow in path building

Change-Id: Id971b55ed73ad4f6b7160f4e9c014e5007d92262
2016-04-14 19:51:41 +00:00
Daniel Rosenberg
aa7db31fbd Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2 am: 20bf84e am: 0b35da7
am: 945228b

* commit '945228bdde777ad3aa814d480d37513db24699fb':
  Fix overflow in path building

Change-Id: I6bf39ad97ffeaf70c347fad4166ba239f93f5449
2016-04-14 19:48:22 +00:00
Daniel Rosenberg
945228bdde Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2 am: 20bf84e
am: 0b35da7

* commit '0b35da7165e9b78a5e35200bac3df4b2c6bc7c36':
  Fix overflow in path building

Change-Id: I07a7bb64ae3174fb8f36cfa1d3651473e5b2f6bf
2016-04-14 19:44:46 +00:00
Daniel Rosenberg
0b35da7165 Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087 am: ad431d2
am: 20bf84e

* commit '20bf84eca094e813fa445b60d22bcf0c27148cd4':
  Fix overflow in path building

Change-Id: Ia4639f0a0dbcb848a6d9c59319c12cd9bd952c8f
2016-04-14 19:41:32 +00:00
Daniel Rosenberg
20bf84eca0 Fix overflow in path building am: 6ea6c04 am: 9c44027 am: 4830087
am: ad431d2

* commit 'ad431d2e2e15cc47b78fa62e4ab362bfdaa77070':
  Fix overflow in path building

Change-Id: Ifa2970afd2862bef780904f2b91a307c16f7a7b8
2016-04-14 19:37:48 +00:00
Daniel Rosenberg
ad431d2e2e Fix overflow in path building am: 6ea6c04 am: 9c44027
am: 4830087

* commit '4830087b3755b4c3498880369ccbe918aa136cd0':
  Fix overflow in path building

Change-Id: Ie2044be5b1c31b1fe128c90eda1c5df169dc0a3d
2016-04-14 19:34:33 +00:00
Daniel Rosenberg
4830087b37 Fix overflow in path building am: 6ea6c04
am: 9c44027

* commit '9c440272192d600c72659da5bfbe0c2e0a133cfe':
  Fix overflow in path building

Change-Id: Idb39dfc88adb854ffbc3bd40be0d28409248fc85
2016-04-14 19:31:17 +00:00
Daniel Rosenberg
9c44027219 Fix overflow in path building
am: 6ea6c04

* commit '6ea6c04ca695e0f0b6bcf3ea4529b9fd74fee8e4':
  Fix overflow in path building

Change-Id: Ia4388b694ddb12083e0d5a67a3a5f3f5bba2fb12
2016-04-14 19:27:58 +00:00
Josh Gao
9ea7795d38 adb: after adb root, wait for the device in any state.
Otherwise, `adb root` while the device is in recovery will hang.

Bug: http://b/28168212
Change-Id: Ibc8038b1745139fb505e466c74c605b9df474c8c
(cherry picked from commit 48a348183f)
2016-04-13 13:13:20 -07:00
Josh Gao
5863fb61e1 adb: add support for 'wait-for-any'.
Allow waiting for a device in any state.

Bug: http://b/28168212
Change-Id: I1876ecd70089ca88f2da5de4182e13724ec50501
(cherry picked from commit 86441c31fe)
2016-04-13 13:13:17 -07:00
Josh Gao
3d8df3cb2a adb: make 'wait-for-{recovery,sideload,bootloader} work.
The help for wait-for-* documents this as working, but we only had a
special case for 'wait-for-device'. Make the others work as well.

Bug: http://b/28170823
Change-Id: I57d70f8b9a383947c4f761919bfbd8515a013520
(cherry picked from commit 08881e72f4)
2016-04-13 13:13:14 -07:00
Daniel Rosenberg
c414027e92 Merge "Fix overflow in path building" into nyc-dev 2016-04-13 18:36:39 +00:00
TreeHugger Robot
e04c9f3436 Merge "Implements 'adb bugreport <ZIP_FILE>'." into nyc-dev 2016-04-13 18:28:19 +00:00
Felipe Leme
44a42677cf Implements 'adb bugreport <ZIP_FILE>'.
Dumpstate now supports zipped bugreport, whose output is more complete
than the flat-file bugreports provided prior to N. As such, adb now has
a 'adb bugreport <ZIP_FILE>' name whose implementation:

- Calls the new bugreportz binary.
- Parses its output, which in case of success is the path of the .zip
  file.
- Pulls the device file and renames it according to the command-line
  argument.

BUG: 27653204

Change-Id: I7169fe157c77bbef1684d0cb4e43095d95ddf2b8
2016-04-13 09:21:23 -07:00
Elliott Hughes
27fe8c904b Merge "Remove undocumented functionality from init." into nyc-dev 2016-04-13 14:45:56 +00:00
Nick Kralevich
d2f0a2c065 init.rc: Restore the /mnt/sdcard symlink
"You are in a maze of twisty little symlinks, all alike."

Restore the /mnt/sdcard symlink, for compatibility with older Android
apps. This symlink was suppose to have been removed in the Gingerbread
time frame, but lives on.

Note: The /mnt/sdcard symlink was originally created in device specific
*.rc files in the device/vendor/hardware/* directory. This change moves
the creation of the symlink into the common init.rc file.

Bug: 25801877
Bug: 28108983
Change-Id: I2f9bf71bddffadb587d7376dfdfc8a546c84ec28
2016-04-12 20:36:01 -07:00
Daniel Rosenberg
6ea6c04ca6 Fix overflow in path building
An incorrect size was causing an unsigned value
to wrap, causing it to write past the end of
the buffer.

Bug: 28085658
Change-Id: Ie9625c729cca024d514ba2880ff97209d435a165
2016-04-13 00:11:52 +00:00
Daniel Rosenberg
db4638ee30 Fix overflow in path building
An incorrect size was causing an unsigned value
to wrap, causing it to write past the end of
the buffer.

Bug: 28085658
Change-Id: Ie9625c729cca024d514ba2880ff97209d435a165
2016-04-12 16:38:41 -07:00
Elliott Hughes
a3cc602630 Remove undocumented functionality from init.
Bug: http://b/28151340
Change-Id: I5360502c79d9113a13055bf017b39c099033e947
2016-04-12 15:38:51 -07:00
Daniel Rosenberg
e3a3288ddd resolve merge conflicts of 2857bd1 to nyc-dev
Change-Id: I3dc666cd44deb3e8438c2a482328f79e7a67e81e
2016-04-12 14:28:09 -07:00
Daniel Rosenberg
2857bd1e44 Add nofail fstab option
am: d38e3c5

* commit 'd38e3c522c162972bb348c0258e3f9e975191c4f':
  Add nofail fstab option

Change-Id: I3cdf284fe188c4f3874b91d8b77d17157160d68d
2016-04-12 21:08:41 +00:00
James Hawkins
c2648132d2 Merge "bootstat: Differentiate system update boot times." into nyc-dev 2016-04-12 17:45:53 +00:00
Dimitry Ivanov
b614045894 Allow vendors to extend the list of public libs
native_loader adds libraries specified in the
(optional) file: /vendor/etc/public.libraries.txt
to the list of public native libraries.

Bug: http://b/27073931
Change-Id: I927193cce99d48c3395bd0e6c373ae9fad0f13f4
(cherry picked from commit 617f495cf7)
2016-04-11 13:13:18 -07:00
James Hawkins
2a5d4245a3 bootstat: Differentiate system update boot times.
Bug: 27454343
Change-Id: Idb2e6f55ad7dda546a486954201619bb73cee6b0
(cherry picked from commit b9cf77159a)
2016-04-11 10:17:46 -07:00
Martijn Coenen
15fea7ae1a Merge "Update get_sched_policy to return TOP_APP correctly." into nyc-dev 2016-04-11 10:31:26 +00:00
Yabin Cui
a3a7a886f5 Merge "init: write bootloader message directly." into nyc-dev 2016-04-08 21:03:43 +00:00
Yabin Cui
46e037980b init: write bootloader message directly.
Bug: 27176738
Change-Id: I8c95a193f3436c0893d5103760b700f3052888db
2016-04-08 11:05:56 -07:00
Mohamad Ayyash
3f28318761 Merge "Move canned_fs_config into libcutils" into nyc-dev 2016-04-08 17:39:05 +00:00
Mohamad Ayyash
8c788588f4 Move canned_fs_config into libcutils
It's no longer specific to make_ext4fs, will be used for mksquashfs as
well.

BUG: 27467028
Change-Id: I41b8c2b168ada45c8378dee522391edfb8f6b9a6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-07 22:44:00 -07:00
Daniel Rosenberg
d38e3c522c Add nofail fstab option
This option allows fs_mgr to ignore mount errors on an optional
partition to allow booting to continue.

Bug: 28071890
Change-Id: I71a2b3c1c573297cab18884b4c4bd7c27ced2901
2016-04-07 20:37:31 -07:00
Ruchi Kandoi
3f9886bb0b healthd: Add charge counter for BatteryProperties.
Bug: 27174034
Change-Id: I26de33714bb353faadb159d898f0b2142c76c657
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-07 23:10:14 +00:00
Dan Stoza
1dcf56080f Merge "graphics.h: Add android_hdr_t" into nyc-dev 2016-04-07 21:32:53 +00:00
Jeff Sharkey
20ca9836b9 Give users and devices control over sdcardfs.
Instead of relying only on kernel support for sdcardfs, give each
device the ability to quickly toggle between sdcardfs and FUSE.  Also
add the ability to users to explicitly enable/disable the behavior
for testing and debugging purposes.

Bug: 27991427
Change-Id: Ie188cb044be2ad87166f2d43c32a1f6b97660de0
2016-04-07 11:05:22 -06:00
Dan Stoza
7f7c1c5de6 graphics.h: Add android_hdr_t
Adds android_hdr_t, which specifies different types of high dynamic
range encodings to be used throughout the system.

Bug: 25684127
Change-Id: Ic92bb5dc64494e643b828a8e24af8760e74e2360
2016-04-06 14:52:10 -07:00
Greg Kaiser
a30a6263d6 Merge "Mutex: Note that STL is generally prefered" into nyc-dev 2016-04-06 12:59:16 +00:00
Mark Salyzyn
402fb79d43 init: turn off backlight when performing shutdown cleanup
(cherry pick from commit a98cc9c202)

Try writing a "0" into:

- /sys/class/leds/lcd-backlight/brightness
- /sys/class/backlight/*/brightness

to turn off the backlight during shutdown cleanup.

Bug: 27506425
Change-Id: Ic8a44dc8909b303f24e14f71cfb43292df60efde
2016-04-05 16:20:59 -07:00
Robb Glasser
a1a8a82e5d Merge "Revert "Revert "HACK: Run e2fsck with -f""" into nyc-dev 2016-04-05 19:56:28 +00:00
Mark Salyzyn
0fcc2ee4e4 init: watchdog restarted during shutdown fsck
(cherry pick from commit ad575e04a1)

Bug: 27506425
Change-Id: I40967068d18ce1a8cbaf0b750e7a7af6eab3e4e8
2016-04-05 12:44:24 -07:00
Greg Kaiser
d62698d4a3 Mutex: Note that STL is generally prefered
This class was designed prior to Android having usable C++11
support.  With that support now in place, we prefer people to
start using the STL threading classes, unless the code needs
to build on Win32.

Change-Id: If1b4d9bdfcb1e65824909376f022842bab9653d6
2016-04-05 12:38:47 -07:00
Robb Glasser
3fb176cb46 Revert "Revert "HACK: Run e2fsck with -f""
bug:28013112

This reverts commit 07068de789.

Change-Id: I1e507f2244a2960e79524ef2aef427f25d79f905
2016-04-05 18:43:37 +00:00
Martijn Coenen
7b173a148b Update get_sched_policy to return TOP_APP correctly.
Currently get_sched_policy() would only return foreground
or background, but not TOP_APP, since it's not looking
at CPUsets at all.

Fixing this makes testing easier, and it also corrects
the output of "ps -P" to show "ta" for current top app.

Bug: 27857142
Change-Id: I589cacc107f355de15750f01b06f404b59a0f99b
2016-04-04 17:11:56 +02:00
Mark Salyzyn
1ab87e7712 logcat: -f <non-existent-directory>/<filename> segfaults
(cherry pick from commit c18c2130d0)

- Check if the result of opendir is NULL in lastLogTime
- Cleanup: alphabetically sorted long options, reserved
  an alias for --regex
- Add a unit test, non existent directory should return
  gracefully with an exit(1) and not SIGSEGV.

NB: This failure was with eng/debug feature logpersist
    turned on, /data/misc/logd/ directory was missing,
    deleted, or temporarily inaccessible.

Bug: 27954627
Change-Id: I60246a53b02fdd7e5490fe458b02ad7b14843584
2016-04-01 12:54:10 -07:00
Daniel Rosenberg
71f6b9569c Merge "Revert "Revert "sdcard: Support sdcardfs""" into nyc-dev 2016-03-31 22:33:57 +00:00
Daniel Rosenberg
3aa261c05a Revert "Revert "sdcard: Support sdcardfs""
Issue resolved by commit
6855c48093e109c92df39340a8355a3be2540b8e
"Skip mounting sdcardfs in core mode."

This reverts commit f8fccd2f5a.

Bug: 27932087
Change-Id: Ibdb72ad16a1e6c3a01edcb03d003c42de7a03cd6
2016-03-31 22:01:41 +00:00
Mark Salyzyn
f58e58a15c liblog: suppress pmsg on user builds
(cherry pick from commit 7ef5249afa)

- add optimized & cached LIBLOG_HIDDEN __android_log_is_debuggable()
- check when writing, either LOG_ID_SECURITY, SafetyNet or
  debuggable when pushing content to the pmsg buffer.

Bug: 27566046
Change-Id: I85f1b55ec329b38e00f4183836b6ed53046c323d
2016-03-31 13:58:56 -07:00
Mark Salyzyn
6267d70b26 Merge "Revert "sdcard: Support sdcardfs"" into nyc-dev 2016-03-31 16:10:14 +00:00
Mark Salyzyn
f8fccd2f5a Revert "sdcard: Support sdcardfs"
This reverts commit 2bd0efa89c.

Bug: 27932087
Change-Id: Ie27f17c1f283514b90ce9da0c895b528d87e5f47
2016-03-31 16:03:22 +00:00