Martijn Coenen
3d62bd2e16
Merge "Create /metadata/apex/[sessions]." am: 13b5c3bee7
...
am: 5cdb3a9af8
2019-03-13 01:18:58 -07:00
Martijn Coenen
5cdb3a9af8
Merge "Create /metadata/apex/[sessions]."
...
am: 13b5c3bee7
2019-03-13 01:08:59 -07:00
Martijn Coenen
13b5c3bee7
Merge "Create /metadata/apex/[sessions]."
2019-03-13 07:46:32 +00:00
Xin Li
7a3160642d
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 35c5cd9139 -s ours
...
am: 652a53cf9a
2019-03-12 22:56:56 -07:00
The Android Open Source Project
e4660ddc99
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 4d916a1ece -s ours
...
am: 8ba23f2a77
2019-03-12 22:34:21 -07:00
Jayant Chowdhary
813aa75f08
Merge "Special case init for android_is_in_vendor_process." am: 3dd9881ca7
...
am: 04d5b78403
2019-03-12 22:32:54 -07:00
Xin Li
652a53cf9a
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
...
am: 35c5cd9139
2019-03-12 22:23:14 -07:00
The Android Open Source Project
8ba23f2a77
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
...
am: 4d916a1ece
2019-03-12 21:47:32 -07:00
Jayant Chowdhary
04d5b78403
Merge "Special case init for android_is_in_vendor_process."
...
am: 3dd9881ca7
2019-03-12 21:45:59 -07:00
Xin Li
35c5cd9139
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
2019-03-13 02:26:03 +00:00
Jayant Chowdhary
3dd9881ca7
Merge "Special case init for android_is_in_vendor_process."
2019-03-13 00:07:05 +00:00
Jooyung Han
ccc0eda89c
Merge "Revert "Mark libs as double_loadable"" am: 1922a501bf
...
am: 037f039cd0
2019-03-12 15:29:26 -07:00
Jooyung Han
037f039cd0
Merge "Revert "Mark libs as double_loadable""
...
am: 1922a501bf
2019-03-12 15:25:15 -07:00
Treehugger Robot
1922a501bf
Merge "Revert "Mark libs as double_loadable""
2019-03-12 22:11:27 +00:00
Martijn Coenen
4517e57ff5
Create /metadata/apex/[sessions].
...
For storing persistent apex session state.
Bug: 126740531
Test: builds
Change-Id: Ibf280764977768956b5512b2252d22ceaba31c1e
2019-03-12 22:05:20 +01:00
Hans Boehm
8dc9aeec82
Merge "Fix wp and sp comparison bugs" am: 28fdb8e282
...
am: 1deb957b15
2019-03-12 11:45:16 -07:00
Hans Boehm
1deb957b15
Merge "Fix wp and sp comparison bugs"
...
am: 28fdb8e282
2019-03-12 11:41:07 -07:00
Hans Boehm
28fdb8e282
Merge "Fix wp and sp comparison bugs"
2019-03-12 18:27:52 +00:00
David Anderson
1912bda2d8
Merge "libfiemap_writer: Fix bugs in vfat handling." am: 7f6d6db24d
...
am: 22a01eed3a
2019-03-12 09:43:37 -07:00
David Anderson
22a01eed3a
Merge "libfiemap_writer: Fix bugs in vfat handling."
...
am: 7f6d6db24d
2019-03-12 09:39:31 -07:00
David Anderson
7f6d6db24d
Merge "libfiemap_writer: Fix bugs in vfat handling."
2019-03-12 16:20:56 +00:00
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
David Anderson
f9134aa1d5
libfiemap_writer: Fix bugs in vfat handling.
...
FIBMAP returns block numbers, whereas fiemap_writer was treating them as
byte offsets.
Bug: 126230649
Test: gsi_tool install to vfat works
Change-Id: Ice80128213425aa9601e381d0fbe53f9581bf596
2019-03-11 19:17:01 -07: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
The Android Open Source Project
4d916a1ece
DO NOT MERGE - Merge PPRL.190305.001 into master
...
Bug: 127812889
Change-Id: I16a546dc24d3cf980ad7ab09895c0d97ee436224
2019-03-11 11:57:28 -07:00
Jayant Chowdhary
a229d3e23e
Special case init for android_is_in_vendor_process.
...
Init is executed without ld.config.<ver>.txt loaded (since sysprop
service isn't up in order for it to read ro.vndk.version and know <ver>). It uses the hard-coded
namespaces in the linker and therefore, does not know about the vndk namespace. That does not mean
it is not a system process.
Bug: 124128212
Test: Boot up device with selinux enforced, use camera to take pictures/ record videos (sanity)
Test: Watch movies on youtube (sanity)
Change-Id: If8701af2ee5dfa3bb36d0ce0a17a23808d184d9f
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2019-03-11 11:18:06 -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
Jooyung Han
55063b1444
Revert "Mark libs as double_loadable"
...
This reverts commit c624621554
2019-03-11 14:10:34 +00:00
