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
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
Mark Salyzyn
27528dacc3
liblog: suppress pmsg on user builds
...
am: f58e58a
* commit 'f58e58a15cea7ba39249093e924a0a6e293c26aa':
liblog: suppress pmsg on user builds
Change-Id: Iead349aeb090f4caefec48dc67fabea795f25852
2016-03-31 21:55:43 +00:00
Mark Salyzyn
33aecaa784
Merge "liblog: suppress pmsg on user builds" am: 0858071
...
am: 24967e5
* commit '24967e5f5e87e5079f416d3cbc3d6a5dba7e8865':
liblog: suppress pmsg on user builds
Change-Id: Ic4f2c02e227ee3c0dc29eb11757dc024aae3b950
2016-03-31 21:07:32 +00:00
Mark Salyzyn
24967e5f5e
Merge "liblog: suppress pmsg on user builds"
...
am: 0858071
* commit '0858071cc4bf2314955936e0efb85cb528ab2d6f':
liblog: suppress pmsg on user builds
Change-Id: I2f36bd72cd53c787b8ada6addec08e27cde87962
2016-03-31 21:04:24 +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
0858071cc4
Merge "liblog: suppress pmsg on user builds"
2016-03-31 20:57:36 +00:00
Mark Salyzyn
35b004a56d
Merge "Revert "sdcard: Support sdcardfs"" into nyc-dev
...
am: 6267d70
* commit '6267d70b2646e020c09439944bebc6aff1d7d652':
Revert "sdcard: Support sdcardfs"
Change-Id: Iab8254f8cbbf54c29857dcf51911a208eab02115
2016-03-31 16:15:59 +00: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
Erik Kline
a723052ac9
Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
...
am: e3a7695
* commit 'e3a769529bbdb9fc2bb583c051329df13c7acf20':
Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
Change-Id: Iba8e8ff22398734d431e60ce2e89bd8687c51526
2016-03-31 08:08:17 +00:00
Erik Kline
91bc2c9084
Merge "Set IFA_BROADCAST during IPv4 RTM_NEWADDRs" am: d709914
...
am: 012d35b
* commit '012d35b7f046f42d97dadd831c8201ecda2daa55':
Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
Change-Id: Ib4ac0486a06551dce8d79fb1e738e9c567328610
2016-03-31 07:10:47 +00:00
Erik Kline
012d35b7f0
Merge "Set IFA_BROADCAST during IPv4 RTM_NEWADDRs"
...
am: d709914
* commit 'd70991477392eb94c77c1680483cabd26befb50a':
Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
Change-Id: Id3b47656b716b2adfa531f857c4fa0cb325a971d
2016-03-31 07:08:08 +00:00
Erik Kline
e3a769529b
Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
...
Bug: 27194345
Bug: 27732412
Bug: 27786864
Change-Id: I5a5b41422bbaab4582c268c213b788f61cb0e169
(cherry picked from commit 06cb8e9203 )
2016-03-31 16:00:40 +09:00
Erik Kline
d709914773
Merge "Set IFA_BROADCAST during IPv4 RTM_NEWADDRs"
2016-03-31 06:58:27 +00:00
Josh Gao
7ffe19e34b
Merge "debuggerd: set the name of the signal sender." into nyc-dev
...
am: 0b5556b
* commit '0b5556b5f08ce4db68496a63dd819020f99cbf33':
debuggerd: set the name of the signal sender.
Change-Id: I1eac6bd7400c86162e52228e917aa819bfcf100c
2016-03-31 02:09:58 +00:00
Mark Salyzyn
338a5e6f82
logcat: add --print flag
...
am: 3bef897
* commit '3bef8973aa12ad0cd1584d528191d1c2d47e2b3a':
logcat: add --print flag
Change-Id: I2c5d9f720ece56c4b252d730363d4a6f48bbc225
2016-03-31 02:09:57 +00:00
Mark Salyzyn
68d6a8bf3d
logcat: posixize and extend long arguments
...
am: 7ec5940
* commit '7ec59405ce1de7777e177654cf2f0fa4dc71656c':
logcat: posixize and extend long arguments
Change-Id: Ib364588f4ce349648ddb2ed1887c5cc527d6f8a2
2016-03-31 02:09:57 +00:00
Mark Salyzyn
0dc901cc9f
logcat: support --regex on binary buffers as-is
...
am: df42ce4 -s ours
* commit 'df42ce4cf33faf800e6cef6d203bd9448a436dbd':
logcat: support --regex on binary buffers as-is
Change-Id: Ic20df695aa4787532a9bf6740b320092a524d3b4
2016-03-31 02:09:57 +00:00
Mark Salyzyn
14c76ed5ea
logcat: do not assign 0 or NULL to global variables
...
am: 9cc9cf0 -s ours
* commit '9cc9cf0280bfd90c8ccaafb250ccd4a4621b1cbc':
logcat: do not assign 0 or NULL to global variables
Change-Id: Ib12d7a4ded0a3052ea348733e787cb47c1d4f11b
2016-03-31 02:05:06 +00:00
Casey Dahlin
0653e593db
logcat: Add --max-count option
...
am: 1164ef6 -s ours
* commit '1164ef6a73b6ec4a1057027a3cb60e2b0b9c2c34':
logcat: Add --max-count option
Change-Id: I69f6ca7a8cf0ca0399503912ff9141c6baf35d36
2016-03-31 02:00:12 +00:00
Casey Dahlin
a27fca5941
logcat: Add --regex option
...
am: 0f7732d -s ours
* commit '0f7732d70810cd66cd2c69a40311785d67044c2c':
logcat: Add --regex option
Change-Id: I3d3075f064d4dee47464c4acb1e2d336973aeaac
2016-03-31 01:57:47 +00:00
Mark Salyzyn
e7ed11c7e5
Merge "logcat: add --print flag" am: a8ee1a3
...
am: 79b5cd7
* commit '79b5cd7a522b7d7de3958111fbae01798ec63177':
logcat: add --print flag
Change-Id: Icc2ba8bc62533ffc730f45b9f70cce4dc12487c8
2016-03-30 23:51:10 +00:00
Josh Gao
0b5556b5f0
Merge "debuggerd: set the name of the signal sender." into nyc-dev
2016-03-30 23:48:44 +00:00
Mark Salyzyn
79b5cd7a52
Merge "logcat: add --print flag"
...
am: a8ee1a3
* commit 'a8ee1a3c61f777d9313edd96a6efe263834921e8':
logcat: add --print flag
Change-Id: I8ed67c33cf81854e0d8c895a52a5af23ac2bcd89
2016-03-30 23:38:18 +00:00
Mark Salyzyn
94b0629d8d
Merge "logcat: posixize and extend long arguments" am: 6dcecd9
...
am: e24888c
* commit 'e24888c9f89485c64d06e3fafd0f64a65d4d6c3a':
logcat: posixize and extend long arguments
Change-Id: I8ece2632d11b34c1e903c08ad7fb3f3653a20ca1
2016-03-30 23:36:11 +00:00