Gavin Corkery
8df32193f3
Rename data/pkg_staging to data/app-staging.
...
Test: atest apex_e2e_tests
Bug: 126330086
Change-Id: Ic5729d60046e8825a2a94e3c3483ea8232a69ed2
Merged-In: Ic5729d60046e8825a2a94e3c3483ea8232a69ed2
2019-03-12 15:38:44 +00:00
Kiyoung Kim
0c2e2f4d14
[automerger skipped] Merge "Add product apk support from libnativeloader" am: 23d774105e am: 5ddcafbb52
...
am: df3995d6a7 -s ours
am skip reason: change_id I8690167ca8098015c8ae4bbb4f028404c5e94dc0 with SHA1 cd8b96cb7c is in history
Change-Id: I52b3d5e1a9086cd489f210b8ac4d0acc92981d38
2019-03-12 02:28:43 -07:00
Kiyoung Kim
df3995d6a7
Merge "Add product apk support from libnativeloader" am: 23d774105e
...
am: 5ddcafbb52
Change-Id: Ida1555d0818c5d8e2a3cf22b5f6f787587216b9d
2019-03-12 02:15:02 -07:00
Kiyoung Kim
5ddcafbb52
Merge "Add product apk support from libnativeloader"
...
am: 23d774105e
Change-Id: I99f7ae5d0ca6b36eb6b57596ef83665c36904ff3
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
8c73ee5afc
Merge "adb: make root/unroot wait for the device to come back." am: 59d4c8a352 am: 983e1a5af2
...
am: 2ef1948cd0
Change-Id: I7b0b6974ad6e90b8143515d486299d75ca8d1a64
2019-03-11 21:17:46 -07:00
Josh Gao
2ef1948cd0
Merge "adb: make root/unroot wait for the device to come back." am: 59d4c8a352
...
am: 983e1a5af2
Change-Id: I8c41df4543417a247a6816f055ee6d512a6cbec1
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
Change-Id: I42b87ad02870afa07631c3a9b7a9468570f1f8ae
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
9c9913ff6a
Merge "Add missing override keyword" am: 8a1fb91e14 am: 29f853d2e1
...
am: b28cf0769d
Change-Id: I8e15d8e3d8590949a534ccb80663c4bc008655d5
2019-03-11 17:54:53 -07:00
Casey Dahlin
b28cf0769d
Merge "Add missing override keyword" am: 8a1fb91e14
...
am: 29f853d2e1
Change-Id: I1b335d648e0977bfc3dc8e2141030ce6bc3f4b67
2019-03-11 17:49:46 -07:00
Casey Dahlin
29f853d2e1
Merge "Add missing override keyword"
...
am: 8a1fb91e14
Change-Id: I830ffece013b56785a26f6b5463c401fb66a2eb1
2019-03-11 17:20:52 -07:00
Pirama Arumuga Nainar
c3320e9e46
Merge "Support zero-length mapped files" am: 2009e32008 am: 747e647bd3
...
am: 4c88d1aec3
Change-Id: I2f19669b7f6d7224497c7c44857b8ed9b2d4e13f
2019-03-11 17:17:04 -07:00
Josh Gao
2986dd4dfc
Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE." am: 22ff8e1909 am: b90db0840a
...
am: 313d214ec0
Change-Id: I63965d5bf49bdf63383bdd6aaac703c06fab5179
2019-03-11 17:15:56 -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
Change-Id: I3003c327899f0d6712f7c5723bc08dd666045b67
2019-03-11 16:52:07 -07:00
Josh Gao
313d214ec0
Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE." am: 22ff8e1909
...
am: b90db0840a
Change-Id: Ia15a78ca5c818e820309e8ab75512e3dc5f48205
2019-03-11 16:51:20 -07:00
Pirama Arumuga Nainar
747e647bd3
Merge "Support zero-length mapped files"
...
am: 2009e32008
Change-Id: I89720d38b64c3ef0143da80e7a26493ef8ff06c6
2019-03-11 16:12:50 -07:00
Josh Gao
b90db0840a
Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE."
...
am: 22ff8e1909
Change-Id: I81b83555625d718443a61ddfdb19badb971845ec
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
f7526d8d85
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master am: 6a335c0442 -s ours
...
am: ff65e8e096 -s ours
am skip reason: subject contains skip directive
Change-Id: I2df75ed8650b699c1d015fcd6cf8501899814203
2019-03-11 09:52:36 -07:00
The Android Open Source Project
62e796888d
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master am: 9ee373a529 -s ours
...
am: 55982872e7 -s ours
am skip reason: subject contains skip directive
Change-Id: I2144fb14744513b1e39cbd93a55e04f761f00e26
2019-03-11 09:34:49 -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 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic210d4c6d589fb6cd2a864889e25bb14d3656836
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 -s ours
am skip reason: subject contains skip directive
Change-Id: I806cd5afd91f50ea89f9d3476776159a87e02387
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 .
Reason for revert: These libs are no longer used by libmediandk(aosp/915075)
Change-Id: I5533a3c22263afb21f4053a569c4a646c9766404
2019-03-11 14:10:34 +00:00
Hans Boehm
029b12ebde
Fix wp and sp comparison bugs
...
Make clear() actually clear wp m_refs, so that nulls compare equal.
Make equality consistent with < and >, ensuring that a weak pointer
cannot be both equal to and greater than another.
Don't rely on the built-in < and > operators to correctly order
different objects. The standard does not guarantee that, and there is
a risk of compiler relying on that lack of guarantee.
Remove unnecessary comparison overloads, especially those
comparing a wp<> to an sp<>.
Change the remaining wp<> to sp<> comparisons to check for equivalence
of the mRefs pointer instead of the object address, thus eliminating
the dubious equal comparison result for a dead wp<> and an sp<> that
happen to point to the same object address.
Add comparison tests.
Test: Treehugger, boot AOSP, atest RefBase
Bug: 126922090
Change-Id: I15911150e0fc85ace2c4b77d337826e12793c690
2019-03-09 21:41:37 -08:00
Christopher Ferris
fdc5bc88d9
Merge "Add unistd.h to includes in Regs.h" am: fdfb9a0113 am: fb62d03824
...
am: fae118aab2
Change-Id: Id5fa85053dfce84393c343f9ff2ccfa173e73f8c
2019-03-09 13:38:05 -08:00
Christopher Ferris
fae118aab2
Merge "Add unistd.h to includes in Regs.h" am: fdfb9a0113
...
am: fb62d03824
Change-Id: Id0356314f4f162fbad485edc6ed76ea339df31bc
2019-03-09 13:33:56 -08:00
Christopher Ferris
fb62d03824
Merge "Add unistd.h to includes in Regs.h"
...
am: fdfb9a0113
Change-Id: I983d1df827a6f4dccdb3cfd4a240a2451c21882b
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
Gavin Corkery
8d73048209
Merge "Rename data/pkg_staging to data/app-staging."
2019-03-09 12:41:28 +00:00
Elliott Hughes
abc51e5e8b
Merge "init: use PLOG rather than strerror." am: 71c084d07e am: f09e388f95
...
am: c721eccf01
Change-Id: I0bcee5ef6e4bebc99cb47ff016f827e6d35421cd
2019-03-08 18:24:51 -08:00
Elliott Hughes
c721eccf01
Merge "init: use PLOG rather than strerror." am: 71c084d07e
...
am: f09e388f95
Change-Id: I237b05607820c6258f7f0f493857efae2452de60
2019-03-08 18:18:42 -08:00
Elliott Hughes
f09e388f95
Merge "init: use PLOG rather than strerror."
...
am: 71c084d07e
Change-Id: I221b82a773282b49de365ee146b24c2d2066e83c
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
0b4fad63ad
Merge "Set cg_file_data_ to null when initialization failed" am: f3762004a3 am: 94f26c2a1d
...
am: 1f01e3415e
Change-Id: I077da425c3f82b441c64c1384dcb8bbf1cb6db72
2019-03-08 16:29:31 -08:00
Wei Wang
1f01e3415e
Merge "Set cg_file_data_ to null when initialization failed" am: f3762004a3
...
am: 94f26c2a1d
Change-Id: I7b64cda65e62a982bc3c3c55ba04a7f6979ce396
2019-03-08 16:25:20 -08:00
Wei Wang
94f26c2a1d
Merge "Set cg_file_data_ to null when initialization failed"
...
am: f3762004a3
Change-Id: I32631d26fcf46389c5667db7d6bdf39f64af2a64
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
Xiaoyong Zhou
27c13df54b
Merge "Change mini-keyctl command format." am: 34e1b402a6 am: 3c6e86bc11
...
am: 4b0a6092cc
Change-Id: I6e4179f6a2b4dfece070d196d343e5b497f37385
2019-03-08 16:08:30 -08: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