Yifan Hong
4b3fcae2df
Merge "BOARD_USES_PRODUCT_SERVICES_IMAGE => BOARD_USES_PRODUCT_SERVICESIMAGE" am: d5f825c78b
...
am: 7f9ba18e25
2018-07-30 09:31:03 -07:00
Yifan Hong
7f9ba18e25
Merge "BOARD_USES_PRODUCT_SERVICES_IMAGE => BOARD_USES_PRODUCT_SERVICESIMAGE"
...
am: d5f825c78b
2018-07-30 09:26:44 -07:00
Treehugger Robot
d5f825c78b
Merge "BOARD_USES_PRODUCT_SERVICES_IMAGE => BOARD_USES_PRODUCT_SERVICESIMAGE"
2018-07-30 16:20:08 +00:00
Thierry Strudel
5aedab3dd9
Merge "healthd_mode_charger: unblank the screen only on first frame" am: a8dcef2012
...
am: ce6c983e5d
2018-07-30 04:00:18 -07:00
Thierry Strudel
ce6c983e5d
Merge "healthd_mode_charger: unblank the screen only on first frame"
...
am: a8dcef2012
2018-07-30 03:56:41 -07:00
Treehugger Robot
a8dcef2012
Merge "healthd_mode_charger: unblank the screen only on first frame"
2018-07-30 10:46:15 +00:00
Thierry Strudel
2cbe2c7b29
healthd_mode_charger: unblank the screen only on first frame
...
Original code is unblank screen for all frames of the first
cycle, unblank is needed only before the first frame of the
first cycle.
Bug: 74771887
Change-Id: I51d8390e359335a0b1cb127b096db1a8b889b169
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2018-07-30 00:18:06 -07:00
David Anderson
884c36be6b
Merge "liblp: Allow building liblp as a shared library." am: 2756339c77
...
am: 4444219482
2018-07-28 16:01:22 -07:00
David Anderson
4444219482
Merge "liblp: Allow building liblp as a shared library."
...
am: 2756339c77
2018-07-28 15:57:51 -07:00
Treehugger Robot
2756339c77
Merge "liblp: Allow building liblp as a shared library."
2018-07-28 22:52:23 +00:00
Luis Hector Chavez
39df31cb51
Merge "init: Cleanly shut down subcontext processes" am: f6b823141e
...
am: 01448be93e
2018-07-27 19:40:16 -07:00
Luis Hector Chavez
01448be93e
Merge "init: Cleanly shut down subcontext processes"
...
am: f6b823141e
2018-07-27 19:36:08 -07:00
David Anderson
f792e4163d
liblp: Allow building liblp as a shared library.
...
Bug: 79173901
Test: system image, partition_tools both build
Change-Id: I70f45d4cebfbddc39d03aa3fb3a56b6c48a20d7e
2018-07-27 19:34:56 -07:00
Treehugger Robot
f6b823141e
Merge "init: Cleanly shut down subcontext processes"
2018-07-28 02:30:22 +00:00
Josh Gao
a63ffb0d03
Merge "adbd: fix check of remount -R." am: d81c4f07fb
...
am: c2553602b3
2018-07-27 18:14:54 -07:00
Josh Gao
c2553602b3
Merge "adbd: fix check of remount -R."
...
am: d81c4f07fb
2018-07-27 18:09:16 -07:00
Treehugger Robot
d81c4f07fb
Merge "adbd: fix check of remount -R."
2018-07-28 01:00:36 +00:00
Elliott Hughes
8baa073ad6
Merge "NDK: add availability comments to <sync.h>." am: 44c2010d47
...
am: f44931d7b8
2018-07-27 17:29:24 -07:00
Elliott Hughes
f44931d7b8
Merge "NDK: add availability comments to <sync.h>."
...
am: 44c2010d47
2018-07-27 17:25:15 -07:00
Treehugger Robot
44c2010d47
Merge "NDK: add availability comments to <sync.h>."
2018-07-28 00:16:22 +00:00
Josh Gao
87bfaeadfe
Merge "adb: split daemon services out of service_to_fd." am: 1ba2e6a27f
...
am: f72e8bb247
2018-07-27 16:30:01 -07:00
Josh Gao
f72e8bb247
Merge "adb: split daemon services out of service_to_fd."
...
am: 1ba2e6a27f
2018-07-27 16:25:50 -07:00
Josh Gao
1ba2e6a27f
Merge "adb: split daemon services out of service_to_fd."
2018-07-27 23:17:18 +00:00
Josh Gao
2712192e12
adbd: fix check of remount -R.
...
The check was accidentally flipped when refactoring from strcmp to
std::string::operator==, inverting the behavior of `remount -R`.
Test: `adb remount` with verity enabled
Change-Id: Ib43889f1f4cc2f8fe1fd5d6e17e47d538dbe91bd
2018-07-27 16:08:56 -07:00
Elliott Hughes
d1c5c5baaa
NDK: add availability comments to <sync.h>.
...
Bug: N/A
Test: N/A
Change-Id: I0cc16cc9c32c6679098aa875d5f81829215868d4
2018-07-27 15:13:33 -07:00
Jerry Zhang
13f95ea18a
Merge "Move recovery to /system/bin" am: 0937a84521
...
am: 3051d54902
2018-07-27 13:48:20 -07:00
Mark Salyzyn
c840256fb6
Merge "adb: use WriteFdExactly when no format" am: c1dabd8f76
...
am: 3c8addb652
2018-07-27 13:47:25 -07:00
Jerry Zhang
3051d54902
Merge "Move recovery to /system/bin"
...
am: 0937a84521
2018-07-27 13:34:11 -07:00
Mark Salyzyn
3c8addb652
Merge "adb: use WriteFdExactly when no format"
...
am: c1dabd8f76
2018-07-27 13:27:57 -07:00
Treehugger Robot
0937a84521
Merge "Move recovery to /system/bin"
2018-07-27 20:25:53 +00:00
Treehugger Robot
c1dabd8f76
Merge "adb: use WriteFdExactly when no format"
2018-07-27 20:06:32 +00:00
Elliott Hughes
7f9fab1eb0
Merge "Restore tcpdump." am: fe732d108b
...
am: 59c99b0f55
2018-07-27 12:13:53 -07:00
Elliott Hughes
59c99b0f55
Merge "Restore tcpdump."
...
am: fe732d108b
2018-07-27 12:08:41 -07:00
Treehugger Robot
fe732d108b
Merge "Restore tcpdump."
2018-07-27 18:54:35 +00:00
Luis Hector Chavez
92c49bcb30
init: Cleanly shut down subcontext processes
...
This change adds an explicit cleanup for the subcontext processes and
avoids them from respawning, which causes a bunch of LOG(FATAL)s when
the system is going down.
Bug: 80425914
Test: kill -TERM $INIT_PID, no crashes for subcontext inits
Change-Id: I135191d959c1dd921b102af316b24d2bc161d6c9
2018-07-27 11:19:44 -07:00
Yifan Hong
bcdfe0d795
BOARD_USES_PRODUCT_SERVICES_IMAGE => BOARD_USES_PRODUCT_SERVICESIMAGE
...
This is the name used by envsetup.sh.
Test: `m init.environ.rc` and see directory
$OUT/root/product-services and see symlink $OUT/system/product-services
Change-Id: Ie615b6d76e2c60e6472900c33d9a87cfe99c4064
2018-07-27 11:14:43 -07:00
Mark Salyzyn
c29bf192b5
adb: use WriteFdExactly when no format
...
Minor cleanup
Test: compile
Bug: 109821005
Bug: 110985612
Change-Id: I15e33a9136675afe7a9498516301ad4960ad2a82
2018-07-27 10:53:54 -07:00
Dario Freni
9c288304a0
[automerger skipped] Merge "Add support for /product-services partition." am: 18be1e2f7e -s ours
...
am: 61774b9eb0
2018-07-27 10:48:29 -07:00
Dario Freni
61774b9eb0
[automerger skipped] Merge "Add support for /product-services partition."
...
am: 18be1e2f7e
2018-07-27 10:37:17 -07:00
Treehugger Robot
18be1e2f7e
Merge "Add support for /product-services partition."
2018-07-27 17:15:05 +00:00
Elliott Hughes
887133101c
Restore tcpdump.
...
tcpdump accidentally fell off the device when its Android.mk was converted
to Android.bp.
Bug: http://b/111654811
Test: builds
Change-Id: Ia49a6722b47c9017b6e573cb88f7a93f3d95db5d
2018-07-27 09:31:01 -07:00
Elliott Hughes
2dcf856516
Merge "Revert "Switch to PCRE grep."" am: 78f5431ff1
...
am: b46ad0e852
2018-07-27 08:19:50 -07:00
Elliott Hughes
b46ad0e852
Merge "Revert "Switch to PCRE grep.""
...
am: 78f5431ff1
2018-07-27 08:16:41 -07:00
Elliott Hughes
78f5431ff1
Merge "Revert "Switch to PCRE grep.""
2018-07-27 15:06:58 +00:00
Chih-Hung Hsieh
5dd9576d05
Merge "Suppress gnu-zero-variadic-macro-arguments warning." am: ff01e54285
...
am: a7ba467f64
2018-07-26 16:35:56 -07:00
Chih-Hung Hsieh
a7ba467f64
Merge "Suppress gnu-zero-variadic-macro-arguments warning."
...
am: ff01e54285
2018-07-26 16:31:54 -07:00
Treehugger Robot
ff01e54285
Merge "Suppress gnu-zero-variadic-macro-arguments warning."
2018-07-26 23:22:44 +00:00
Tom Cherry
54676604e3
Merge "ueventd: Add dynamic kernel module loading" am: 8b25b87074
...
am: dd62c204da
2018-07-26 15:19:12 -07:00
Tom Cherry
dd62c204da
Merge "ueventd: Add dynamic kernel module loading"
...
am: 8b25b87074
2018-07-26 15:08:21 -07:00
Elliott Hughes
f9408d5cdf
Revert "Switch to PCRE grep."
...
This reverts commit 90a018a87ahttp://b/111849261
Bug: https://bugs.exim.org/show_bug.cgi?id=2294
Test: manual
Change-Id: I72ae637c84f0eb1c2b5291db73ebff1628d54110
2018-07-26 14:52:45 -07:00
