Commit Graph

49176 Commits

Author SHA1 Message Date
Jooyung Han 037f039cd0 Merge "Revert "Mark libs as double_loadable""
am: 1922a501bf

Change-Id: I9c5a3d811cbdb45a3d6bc7c4524e3d20a6959191
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 67f9c17f0b Merge "Fix wp and sp comparison bugs" am: 28fdb8e282 am: 1deb957b15
am: 8dc9aeec82

Change-Id: I9179b208f7760d3ab837e28a169f8144f9666129
2019-03-12 11:50:25 -07:00
Hans Boehm 8dc9aeec82 Merge "Fix wp and sp comparison bugs" am: 28fdb8e282
am: 1deb957b15

Change-Id: Id592242b07588c50a743c5b53eaecaca44b7acbb
2019-03-12 11:45:16 -07:00
Hans Boehm 1deb957b15 Merge "Fix wp and sp comparison bugs"
am: 28fdb8e282

Change-Id: If5eae1a7d63c284dc2d4eaf522e04ca8ddde1ca5
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
Neil Fuller 9358e0972f Add an env variable for the tzdata module root
The ANDROID_TZDATA_ROOT maps to the /apex/com.android.tzdata
location on device like ANDROID_RUNTIME_ROOT maps to the
/apex/com.android.runtime location.

Bug: 128422035
Test: build only
Change-Id: Id90006004ca652564e530f3694600ac4afd798ed
2019-03-12 16:52:36 +00:00
David Anderson b20df875c1 Merge "libfiemap_writer: Fix bugs in vfat handling." am: 7f6d6db24d am: 22a01eed3a
am: 1912bda2d8

Change-Id: I8f8189eaf7582d8f7ef628a4672ec5b991895604
2019-03-12 09:46:49 -07:00
David Anderson 1912bda2d8 Merge "libfiemap_writer: Fix bugs in vfat handling." am: 7f6d6db24d
am: 22a01eed3a

Change-Id: Ice4f2b39fb97cbda876e2b136a00834952c22e0d
2019-03-12 09:43:37 -07:00
David Anderson 22a01eed3a Merge "libfiemap_writer: Fix bugs in vfat handling."
am: 7f6d6db24d

Change-Id: I654e9ce9b72ad9f52a7324b36fe227e1750ae741
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 034f0e16c0 Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set" am: 8d246b22ee am: 0e505123e1
am: cff70e6328

Change-Id: Ia451c27b22d998b20dd11024841c29cf073d5768
2019-03-12 09:06:14 -07:00
Mark Salyzyn cff70e6328 Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set" am: 8d246b22ee
am: 0e505123e1

Change-Id: Ied66003c52cb2686795cbe93b1d9f0a5be7ad00c
2019-03-12 08:56:03 -07:00
Mark Salyzyn 0e505123e1 Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set"
am: 8d246b22ee

Change-Id: I085793a341d1de0ef666a68933de4b923da53f94
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
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