Mark Salyzyn
cff70e6328
Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set" am: 8d246b22ee
...
am: 0e505123e1
2019-03-12 08:56:03 -07:00
Mark Salyzyn
0e505123e1
Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set"
...
am: 8d246b22ee
2019-03-12 08:51:53 -07:00
Mark Salyzyn
8d246b22ee
Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set"
2019-03-12 15:44:29 +00:00
Kiyoung Kim
df3995d6a7
Merge "Add product apk support from libnativeloader" am: 23d774105e
...
am: 5ddcafbb52
2019-03-12 02:15:02 -07:00
Kiyoung Kim
5ddcafbb52
Merge "Add product apk support from libnativeloader"
...
am: 23d774105e
2019-03-12 02:05:46 -07:00
Kiyoung Kim
23d774105e
Merge "Add product apk support from libnativeloader"
2019-03-12 08:48:46 +00:00
Josh Gao
2ef1948cd0
Merge "adb: make root/unroot wait for the device to come back." am: 59d4c8a352
...
am: 983e1a5af2
2019-03-11 21:13:35 -07:00
Josh Gao
983e1a5af2
Merge "adb: make root/unroot wait for the device to come back."
...
am: 59d4c8a352
2019-03-11 21:10:23 -07:00
Treehugger Robot
59d4c8a352
Merge "adb: make root/unroot wait for the device to come back."
2019-03-12 04:01:00 +00:00
Casey Dahlin
b28cf0769d
Merge "Add missing override keyword" am: 8a1fb91e14
...
am: 29f853d2e1
2019-03-11 17:49:46 -07:00
Casey Dahlin
29f853d2e1
Merge "Add missing override keyword"
...
am: 8a1fb91e14
2019-03-11 17:20:52 -07:00
Treehugger Robot
8a1fb91e14
Merge "Add missing override keyword"
2019-03-11 23:56:30 +00:00
Pirama Arumuga Nainar
4c88d1aec3
Merge "Support zero-length mapped files" am: 2009e32008
...
am: 747e647bd3
2019-03-11 16:52:07 -07:00
Josh Gao
313d214ec0
Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE." am: 22ff8e1909
...
am: b90db0840a
2019-03-11 16:51:20 -07:00
Pirama Arumuga Nainar
747e647bd3
Merge "Support zero-length mapped files"
...
am: 2009e32008
2019-03-11 16:12:50 -07:00
Josh Gao
b90db0840a
Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE."
...
am: 22ff8e1909
2019-03-11 16:12:05 -07:00
Josh Gao
3c99b0f94f
adb: make root/unroot wait for the device to come back.
...
Test: manually unplugged a device after adb root
Change-Id: I588283a666cc5e19d809d7ce81b5300398e8be2d
2019-03-11 15:59:09 -07:00
Treehugger Robot
2009e32008
Merge "Support zero-length mapped files"
2019-03-11 22:49:56 +00:00
Treehugger Robot
22ff8e1909
Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE."
2019-03-11 22:48:46 +00:00
Josh Gao
007a4dc7a6
adbd: properly handle FUNCTIONFS_BIND without ENABLE.
...
If a device is unplugged, a BIND will happen without an ENABLE until the
device is plugged in, which would previously result in adbd crashing
every 5 seconds due to an attempt to join a thread that hadn't been
started.
Bug: http://b/128255355
Test: manually observed adbd via serial cable while unplugged
Change-Id: I90d6384e7e829df1ffaf73a95f2418a2ff97fb03
2019-03-11 13:06:17 -07:00
Casey Dahlin
6e96f68cf3
Add missing override keyword
...
Fuchsia builds with Clang, and it's a bit pickier about always using
override when it's appropriate.
Test: None
2019-03-11 12:35:41 -07:00
Mark Salyzyn
6fc0829c5a
bootstat: add recovery,quiescent and reboot,quiescent to known set
...
Reserve recovery,quiescent and reboot,quiescent to known reboot
reasons.
Test: none
Bug: 120624642
Change-Id: I78c52f6db447c9d3980a3f2007471bc7aa60e25f
2019-03-11 10:08:05 -07:00
Xin Li
ff65e8e096
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
...
am: 6a335c0442
2019-03-11 09:31:13 -07:00
The Android Open Source Project
55982872e7
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
...
am: 9ee373a529
2019-03-11 09:22:13 -07:00
Xin Li
6a335c0442
Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
2019-03-11 16:09:42 +00:00
Christopher Ferris
fae118aab2
Merge "Add unistd.h to includes in Regs.h" am: fdfb9a0113
...
am: fb62d03824
2019-03-09 13:33:56 -08:00
Christopher Ferris
fb62d03824
Merge "Add unistd.h to includes in Regs.h"
...
am: fdfb9a0113
2019-03-09 13:29:52 -08:00
Christopher Ferris
fdfb9a0113
Merge "Add unistd.h to includes in Regs.h"
2019-03-09 21:21:27 +00:00
Elliott Hughes
c721eccf01
Merge "init: use PLOG rather than strerror." am: 71c084d07e
...
am: f09e388f95
2019-03-08 18:18:42 -08:00
Elliott Hughes
f09e388f95
Merge "init: use PLOG rather than strerror."
...
am: 71c084d07e
2019-03-08 18:14:32 -08:00
Treehugger Robot
71c084d07e
Merge "init: use PLOG rather than strerror."
2019-03-09 02:04:56 +00:00
Wei Wang
1f01e3415e
Merge "Set cg_file_data_ to null when initialization failed" am: f3762004a3
...
am: 94f26c2a1d
2019-03-08 16:25:20 -08:00
Wei Wang
94f26c2a1d
Merge "Set cg_file_data_ to null when initialization failed"
...
am: f3762004a3
2019-03-08 16:21:11 -08:00
Treehugger Robot
f3762004a3
Merge "Set cg_file_data_ to null when initialization failed"
2019-03-09 00:15:05 +00:00
The Android Open Source Project
9ee373a529
DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
...
Bug: 127812889
Change-Id: Idddc51e980d089c4923bf3a05dd33b7c94ed1f92
2019-03-08 15:57:00 -08:00
Xiaoyong Zhou
4b0a6092cc
Merge "Change mini-keyctl command format." am: 34e1b402a6
...
am: 3c6e86bc11
2019-03-08 15:56:52 -08:00
Xiaoyong Zhou
3c6e86bc11
Merge "Change mini-keyctl command format."
...
am: 34e1b402a6
2019-03-08 15:43:18 -08:00
Treehugger Robot
34e1b402a6
Merge "Change mini-keyctl command format."
2019-03-08 23:17:01 +00:00
Casey Dahlin
0e113851a5
Add unistd.h to includes in Regs.h
...
This is required to use pid_t, but by luck nobody noticed its absence
until the Fuchsia build.
Test: Code now builds inside Fuchsia
2019-03-08 15:04:48 -08:00
Elliott Hughes
076305e4fb
init: use PLOG rather than strerror.
...
Test: builds
Change-Id: Ifdba8e7fa4cd5c852946bb0f398382f2d64674cd
2019-03-08 12:34:53 -08:00
Josh Gao
4b868d648b
Merge "Restrict scanning port range, not emulator count" am: e6413fcd94
...
am: b4954166ac
2019-03-08 12:10:28 -08:00
Josh Gao
b4954166ac
Merge "Restrict scanning port range, not emulator count"
...
am: e6413fcd94
2019-03-08 11:56:23 -08:00
Josh Gao
e6413fcd94
Merge "Restrict scanning port range, not emulator count"
2019-03-08 19:29:43 +00:00
android-build-team Robot
5d1d32dcbf
Snap for 5240760 from 20ac1203a3 to pi-platform-release
...
Change-Id: I6bbede2f8c74a9f344df6f3c713de709eb79cd26
2019-03-08 18:40:29 +00:00
Wei Wang
d71d30179c
Set cg_file_data_ to null when initialization failed
...
Cannot really do calls if initialization failed.
Also fix LOG usage.
But: 124774415
Test: Build
Change-Id: Ifd7db90cfee51ba5830e1d4db8f8d19b5bc9feba
2019-03-08 10:18:06 -08:00
Xiaoyong Zhou
b29b27ec7f
Change mini-keyctl command format.
...
This CL change the mini-keyctl tool to make it compitable with libkeyctl
tool to make it more useful.
Bug: 112038861
Test: mini-keyctl padd asymmetric 'desc' .fs-verity < /path/to/cert.der
Test: mini-keyctl unlink <key_id> <keyring_id>
Test: mini-keyctl restrict_keyring <keyring_id>
Change-Id: I950f07c7718f173823ce5a5cd08e0d1a0e23a007
2019-03-08 09:59:42 -08:00
Mark Salyzyn
07503d3eef
Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" am: 6c5c085e41
...
am: bd15393281
2019-03-08 09:58:47 -08:00
Mark Salyzyn
bd15393281
Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()"
...
am: 6c5c085e41
2019-03-08 09:22:53 -08:00
Mark Salyzyn
6c5c085e41
Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()"
2019-03-08 17:05:03 +00:00
Roland Levillain
fcd734a433
Merge "Fix a typo in linker configuration comments." am: ecef987a35
...
am: 58e3b61d1e
2019-03-08 03:58:55 -08:00
