Commit graph

47201 commits

Author SHA1 Message Date
Valerie Hau
53cfb691ed Merge "Revert "Fix wp and sp comparison bugs"" am: e61e8c6b62
am: 85178d56a4

Change-Id: I3cacdd7a09e132f98f4367ced3289c3c14df9398
2019-03-13 08:29:28 -07:00
Valerie Hau
85178d56a4 Merge "Revert "Fix wp and sp comparison bugs""
am: e61e8c6b62

Change-Id: Id7ee61d98e2354fe346d76b91be5a820c40eaf29
2019-03-13 08:20:13 -07:00
Valerie Hau
e61e8c6b62 Merge "Revert "Fix wp and sp comparison bugs"" 2019-03-13 15:03:04 +00:00
Neil Fuller
4f92416fa1 Merge "Add an env variable for the tzdata module root" am: 822dbd8911
am: 8c8d8f5df9

Change-Id: Id3d64d79c6874314ad35f26e2459fc316adf9141
2019-03-13 01:59:07 -07:00
Neil Fuller
8c8d8f5df9 Merge "Add an env variable for the tzdata module root"
am: 822dbd8911

Change-Id: I68b3dc4ee4dc8a5a0a6e8aade1e4490afbf20581
2019-03-13 01:54:55 -07:00
Neil Fuller
822dbd8911 Merge "Add an env variable for the tzdata module root" 2019-03-13 08:49:30 +00:00
Martijn Coenen
3d62bd2e16 Merge "Create /metadata/apex/[sessions]." am: 13b5c3bee7
am: 5cdb3a9af8

Change-Id: Ifa080ea5d8aea313f4bd2b9e63b8ec1f37ed7cc1
2019-03-13 01:18:58 -07:00
Martijn Coenen
5cdb3a9af8 Merge "Create /metadata/apex/[sessions]."
am: 13b5c3bee7

Change-Id: I0a1786a437377c7db2505c792f8a174b23042131
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 -s ours
am skip reason: subject contains skip directive

Change-Id: I1fddbcb77b03465ad18d7622f9118e74bf955b32
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 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I027bb7229d5d65953e7dc34dda19e7703bfd07cb
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 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b2a4e6c90f014b15658292134e374f2b3802208
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 -s ours
am skip reason: subject contains skip directive

Change-Id: I31a0756b75ab6d657dc26807ce8baeb42c40d232
2019-03-12 21:47:32 -07:00
Jayant Chowdhary
04d5b78403 Merge "Special case init for android_is_in_vendor_process."
am: 3dd9881ca7

Change-Id: I49c4d42398f13737e8ddc6c0c04ad685e561b463
2019-03-12 21:45:59 -07:00
Hans Boehm
a2a2ad8057 Revert "Fix wp and sp comparison bugs"
This reverts commit 029b12ebde.

Reason for revert: There appear to be problems with null comparisons. Reported failure in HwcBufferCacheTest.

Change-Id: I19745bb281dabe8b05c2df3fe95e7be7a49dcd51
2019-03-13 03:24:12 +00: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

Change-Id: I54b6cb06d8a1d46042b45b9785ed4c00fe7eb96e
2019-03-12 15:29:26 -07:00
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
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
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
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
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
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
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
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