Commit graph

22581 commits

Author SHA1 Message Date
Elliott Hughes
2a651e603a Merge "property_service: drop unused header" am: 1134925
am: b627a01

* commit 'b627a014b97a4ffdfe6d4ca4c2e47b61cd87321d':
  property_service: drop unused header

Change-Id: I44b28ece5694d811d55a3de963e95ca14ff68cb0
2016-04-08 01:55:36 +00:00
Elliott Hughes
6ba3710651 Merge "init: drop unused header android_filesystem_config.h" am: 54c27c7
am: 8cb6a9c

* commit '8cb6a9cdb7cb1feaff29914aa88c68399e32f14f':
  init: drop unused header android_filesystem_config.h

Change-Id: I1cc001c883199e8355e97d93a2f6ce0d46bdd767
2016-04-08 01:55:36 +00:00
Elliott Hughes
ff37c38bac Merge "init: switch from android_ids to getpwnam" am: 171504f
am: 43cbd05

* commit '43cbd0585b50996e1601dc6ed56e723aded810c8':
  init: switch from android_ids to getpwnam

Change-Id: I100993cfb07f23bb5b3079846d4e00f31d1a9794
2016-04-08 01:55:35 +00:00
William Roberts
b627a014b9 Merge "property_service: drop unused header"
am: 1134925

* commit '1134925fb645df948387247aad4d3da7be1eb320':
  property_service: drop unused header

Change-Id: I86c954e936c4249900fe3680a3df254932eecd12
2016-04-08 01:51:37 +00:00
William Roberts
8cb6a9cdb7 Merge "init: drop unused header android_filesystem_config.h"
am: 54c27c7

* commit '54c27c7cf6a20fb74f054d41b414cd4124e9c1fe':
  init: drop unused header android_filesystem_config.h

Change-Id: I2a43f41a0020e5186c52766d8e5b701025650d19
2016-04-08 01:51:37 +00:00
William Roberts
43cbd0585b Merge "init: switch from android_ids to getpwnam"
am: 171504f

* commit '171504f8318b8d48c830bef3b9ff1451d76037b2':
  init: switch from android_ids to getpwnam

Change-Id: Idf79bfd2cf6436819447f12bce934329692012cd
2016-04-08 01:51:37 +00:00
Elliott Hughes
1134925fb6 Merge "property_service: drop unused header" 2016-04-08 01:42:45 +00:00
Elliott Hughes
54c27c7cf6 Merge "init: drop unused header android_filesystem_config.h" 2016-04-08 01:42:29 +00:00
Elliott Hughes
171504f831 Merge "init: switch from android_ids to getpwnam" 2016-04-08 01:42:09 +00:00
Ruchi Kandoi
8df54e7721 healthd: Add charge counter for BatteryProperties.
am: 3f9886b

* commit '3f9886bb0bce7297c676907ded51c402d7b61654':
  healthd: Add charge counter for BatteryProperties.

Change-Id: I4fbdeebcd50acae22712dde8a2192475051c9d96
2016-04-08 01:19:36 +00: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
76a903224f Merge "graphics.h: Add android_hdr_t" into nyc-dev
am: 1dcf560

* commit '1dcf56080f7a396d57a9bd0e2c601f739a4bdf9a':
  graphics.h: Add android_hdr_t

Change-Id: I816d5741dfec2b9f69fd3d1e4426bf00b9b8cee7
2016-04-07 21:41:15 +00:00
Dan Stoza
1dcf56080f Merge "graphics.h: Add android_hdr_t" into nyc-dev 2016-04-07 21:32:53 +00:00
William Roberts
8e1dce8ba0 property_service: drop unused header
Remove android_filesystem_config.h since it was not being used.

Change-Id: I691513d50a3fdb7563a63aee7551137ba983825c
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
6df15704bd init: drop unused header android_filesystem_config.h
Change-Id: I66e637bc2d7fd5f385f40f150becfe515c53c19a
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
3792e6cf21 init: switch from android_ids to getpwnam
Start to move users of android_filesystem_config.h to use the
standard grp and pwd interface functions.

Advantages:
  * one copy of android_ids in libc, removing it from init objects.
  * immediately starts oem_xxx users and groups in rc.
  * future will support _named_ oem ids via backend improvements.

Change-Id: Ib1ae1e0cbdcaaf60deb3759681a6030b615c069c
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:36 -07:00
Jeff Sharkey
0762e99064 Give users and devices control over sdcardfs.
am: 20ca983

* commit '20ca9836b9a780c41a22850f478a29f29677553e':
  Give users and devices control over sdcardfs.

Change-Id: I0144b346157952f79fdde5100f0fdc01daa58d9b
2016-04-07 18:05:28 +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
e60b407d43 Merge "Mutex: Note that STL is generally prefered" into nyc-dev
am: a30a626

* commit 'a30a6263d632a7d2dedc4f09c6707ab20df3fb1a':
  Mutex: Note that STL is generally prefered

Change-Id: I69eec173bf9679dc592987bd78cc8edcc81a1fbb
2016-04-06 13:06:00 +00: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
a5d2e48a61 init: turn off backlight when performing shutdown cleanup
am: 402fb79

* commit '402fb79d4354aa3a627bf38a0fc10718c2b90a20':
  init: turn off backlight when performing shutdown cleanup

Change-Id: I5220dc4768d56ab27c3c4b5c2da7fb421a23c4c5
2016-04-05 23:44:27 +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
Mark Salyzyn
24f79bed76 Merge "init: turn off backlight when performing shutdown cleanup" am: adf1cde
am: 23702b5

* commit '23702b538b3a02ca35f24c55d406a7cc7b14641f':
  init: turn off backlight when performing shutdown cleanup

Change-Id: I249106a3b6c22e77d06bca5aee1d92184b00ba33
2016-04-05 23:14:28 +00:00
Mark Salyzyn
23702b538b Merge "init: turn off backlight when performing shutdown cleanup"
am: adf1cde

* commit 'adf1cdeda07acfa6fc96627f8d4fca5b98bb7428':
  init: turn off backlight when performing shutdown cleanup

Change-Id: I8267dbbca11d41042e51d3fb89355e46b5cf4a81
2016-04-05 23:11:11 +00:00
Mark Salyzyn
adf1cdeda0 Merge "init: turn off backlight when performing shutdown cleanup" 2016-04-05 23:03:22 +00:00
Mark Salyzyn
a98cc9c202 init: turn off backlight when performing shutdown cleanup
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 15:56:27 -07:00
Robb Glasser
2f5d1da43e Merge "Revert "Revert "HACK: Run e2fsck with -f""" into nyc-dev
am: a1a8a82

* commit 'a1a8a82e5dd177b84ab78cbb1630c10057bab80c':
  Revert "Revert "HACK: Run e2fsck with -f""

Change-Id: Ifc6b20404e5057093dbe5aa5f1bf82d0d6f568a7
2016-04-05 20:00:46 +00: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
7b1879e8e5 init: watchdog restarted during shutdown fsck
am: 0fcc2ee

* commit '0fcc2ee4e4e6142c0d789a456f18caf33596ea3c':
  init: watchdog restarted during shutdown fsck

Change-Id: I45f622d05b08525a79d9fc43ee869b7e5d3178cf
2016-04-05 19:51:30 +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
Mark Salyzyn
e4c8b31fed Merge "init: watchdog restarted during shutdown fsck" am: 3443caa
am: 34dcdd8

* commit '34dcdd8075a0c12de552219d4f326bccd1c8fe62':
  init: watchdog restarted during shutdown fsck

Change-Id: I28e3a730f2d854c51f1d760a5400faecd3f1fafc
2016-04-05 18:44:59 +00: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
Mark Salyzyn
34dcdd8075 Merge "init: watchdog restarted during shutdown fsck"
am: 3443caa

* commit '3443caa2fe8bfd7ef0d1f2cac8fea4dc6530a9cf':
  init: watchdog restarted during shutdown fsck

Change-Id: I7b16347948ffb1b39cd787dc10056e56bfc3ed0c
2016-04-05 18:41:50 +00:00
Mark Salyzyn
3443caa2fe Merge "init: watchdog restarted during shutdown fsck" 2016-04-05 18:32:52 +00:00
Mark Salyzyn
ad575e04a1 init: watchdog restarted during shutdown fsck
Bug: 27506425
Change-Id: I40967068d18ce1a8cbaf0b750e7a7af6eab3e4e8
2016-04-05 11:31:14 -07:00
Elliott Hughes
8ea300663e Merge "Fix Condition::waitRelative." am: 0d6bb55
am: 9bf8f9e

* commit '9bf8f9efd4945513f2713159c1d72a7a7bd9cfb5':
  Fix Condition::waitRelative.

Change-Id: I378c8cbdd1b8f2563b6f2e0f7fb3799f0127eff7
2016-04-05 16:54:44 +00:00
Elliott Hughes
9bf8f9efd4 Merge "Fix Condition::waitRelative."
am: 0d6bb55

* commit '0d6bb55a39c453785db67039fca5e72e75286d5e':
  Fix Condition::waitRelative.

Change-Id: I4536446eef6e2c9a0367e591aa4c811a15504410
2016-04-05 16:51:48 +00:00
Elliott Hughes
0d6bb55a39 Merge "Fix Condition::waitRelative." 2016-04-05 16:43:25 +00:00
Elliott Hughes
fd376b97f7 Fix Condition::waitRelative.
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE has never been defined for LP64,
so let's have everyone use the same code path.

Also fix the possible overflow.

Bug: http://b/26944282
Bug: http://b/27918161
Change-Id: I51fc0ebb1f6b860dc62d721f8ebfbcf724ce66e7
2016-04-04 14:51:21 -07:00
Mark Salyzyn
b87e8aa959 logcat: -f <non-existent-directory>/<filename> segfaults
am: 1ab87e7  -s ours

* commit '1ab87e7712cea615ecdf70e65d74d14d3fd8fa85':
  logcat: -f <non-existent-directory>/<filename> segfaults

Change-Id: Ib0f855a739c6a5bd5a77a8942c3f8cb3ddfd881c
2016-04-01 21:38:37 +00:00
Mark Salyzyn
d17be81cc2 Merge "logcat: -f <non-existent-directory>/<filename> segfaults" am: ba6de23
am: 29ae8de

* commit '29ae8de99c6c942701379ac8906920c48c0fafa7':
  logcat: -f <non-existent-directory>/<filename> segfaults

Change-Id: Ifc38d6377269cd2263a3f2e1096577419d850ca4
2016-04-01 20:36:22 +00:00
Mark Salyzyn
29ae8de99c Merge "logcat: -f <non-existent-directory>/<filename> segfaults"
am: ba6de23

* commit 'ba6de23e97cbb8351fe5cc2cc4d698b11ad04797':
  logcat: -f <non-existent-directory>/<filename> segfaults

Change-Id: I8de9b9d8cabade33b1af9fc0918d1c881c93994d
2016-04-01 20:08:08 +00: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
Mark Salyzyn
ba6de23e97 Merge "logcat: -f <non-existent-directory>/<filename> segfaults" 2016-04-01 19:51:43 +00:00
Mark Salyzyn
c18c2130d0 logcat: -f <non-existent-directory>/<filename> segfaults
- 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 09:42:32 -07:00
Daniel Rosenberg
298cb9a1e9 Merge "Revert "Revert "sdcard: Support sdcardfs""" into nyc-dev
am: 71f6b95

* commit '71f6b9569c2c707d061b96e48021b4be617e40a4':
  Revert "Revert "sdcard: Support sdcardfs""

Change-Id: I37880f88c21bec8a0dcd4ff8e93ea0986f0b8475
2016-03-31 22:47:30 +00: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