summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* art: add kryo785 architecture variant.HEADs12.1Sungwook Jung2022-05-201-0/+3
| | | | | CRs-Fixed: 2966364 Change-Id: I9ea83f5b6f2767847c6416560728a7c29199b862
* art: Conditionally remove version check for memfd_create()Nicholas Lim2022-03-143-3/+11
| | | | | | | | | | | * This check is redundant as devices that lack the memfd_create syscall will fail to boot regardless of the check. This conditionally reverts commit 51f89d9. Change-Id: Ife2cebde713e14bd787f48628092650866e2ac09 (cherry picked from commit dd1d9ba1851d96a8d4f55cd8e983fcee1519d953)
* Snap for 7859607 from f192ca3ca279cadc41aecd225c6b4d555bce6360 to sc-v2-releaseAndroid Build Coastguard Worker2021-10-271-1/+1
|\ | | | | | | Change-Id: I83760e7c6b049aa60d0079f4da2d7b7afb6d5c1c
| * Allow PROT_EXEC on the zygote mappings when falling back to ashmem am: ↵Nicolas Geoffray2021-10-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 94e2fc9465 am: a09c5cf5e4 Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/16093381 Change-Id: I7911e0d3744021902bad197e35d0660160cf1355
| | * Allow PROT_EXEC on the zygote mappings when falling back to ashmem am: ↵Nicolas Geoffray2021-10-271-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94e2fc9465 Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/16093381 Change-Id: I9de833834a8630e3f9145c00e5b47027ee794d6d
| | | * Allow PROT_EXEC on the zygote mappings when falling back to ashmemNicolas Geoffray2021-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we now protect the mappings before creating the executable one, we need to also allow PROT_EXEC on an ashmem region. Test: manually change code to use ashmem, build, see that JIT is created. Bug: 202999239 Merged-In: I9f2944c45f4ff607c7e341552c82138bfe13cca4 (cherry picked from commit 8c63ce27d4d3e87f535769976e9b9185fa372b9b) Change-Id: I8a5e9655e6c40404389344e78c21b0ebd5a1a4b9
* | | | Snap for 7795143 from b214977b4e5248dce1960e4488959a5228d9876d to sc-v2-releaseAndroid Build Coastguard Worker2021-10-052-62/+130
|\| | | | | | | | | | | | | | | Change-Id: I8c818dc8a2a3c3339d1de5c4a4b4d7518d1b494f
| * | | Change order of creation of JIT mappings. am: c95b630423 am: f0171ddd40Nicolas Geoffray2021-10-052-62/+130
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15951443 Change-Id: If01264c4b804088f9d1653a10842a5d004efb09f
| | * | Change order of creation of JIT mappings. am: c95b630423Nicolas Geoffray2021-10-052-62/+130
| | |\| | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15951443 Change-Id: Ide27dbe61bff2affd67a3cb02fc1bc09dfb2f393
| | | * Change order of creation of JIT mappings.Nicolas Geoffray2021-10-052-62/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure we don't create mappings that can later be turned into writable mappings. Ignore-AOSP-First: b/200284993 Test: jit_memory_region_test Test: device booting Bug: 200284993 Change-Id: I5160e61d287207563af57b71d50b08364ca892a0
* | | | Snap for 7771957 from cf8b1f381cd269b4d0e958b33cb46fdef1cd1fdd to sc-v2-releaseAndroid Build Coastguard Worker2021-09-2710-107/+107
|\| | | | | | | | | | | | | | | Change-Id: Ib6b4d9c7dc938c30805aa365aaf9c14c51d99c65
| * | | Better isolate standalone ART gtests on device. am: 2174ba31dfRoland Levillain2021-09-2710-107/+107
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15920603 Change-Id: Ic0ede917564d42003d103ad4936c746b391dd13f
| | * | Better isolate standalone ART gtests on device.Roland Levillain2021-09-2710-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standalone ART gtests used to be installed in the same directory on device (`/data/local/tmp/nativetest`), which could be a race condition. In particular, some ART gtests are run as root (e.g. `art_standalone_dexoptanalyzer_tests`) and create the `/data/local/tmp/nativetest` directory with `root` ownership/permissions, preventing any subsequent ART gtest not run as root (e.g. `art_standalone_cmdline_tests`) from installing its artifacts in that directory. To prevent these issues, use a different directory on device (under `/data/local/tmp`) per standalone ART gtest. (cherry picked from commit d8c0ac264f606bf0c69781388ca6048eb0a4b55f) (cherry picked from commit 58a79873e94dbe4a168221fc95b641dbf8cd3e3e) Test: atest art_standalone_dexoptanalyzer_tests \ && atest art_standalone_cmdline_tests Test: atest art_standalone_\*_tests Bug: 194403904 Bug: 162834439 Change-Id: I141c1676382b078c1441e5782b3dc77affafa3fc Merged-In: I141c1676382b078c1441e5782b3dc77affafa3fc
| * | | [automerger skipped] Revert "Add standalone ART gtests to `TEST_MAPPING` ↵Roland Levillain2021-09-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group `presubmit`." am: c57043bb4b -s ours am: 17ab50efa5 -s ours am skip reason: Merged-In Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19 with SHA-1 66372d2c44 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15843431 Change-Id: Iea99a397d5ea58cc19ce4380878048f6e86177c1
| | * | [automerger skipped] Revert "Add standalone ART gtests to `TEST_MAPPING` ↵Roland Levillain2021-09-270-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group `presubmit`." am: c57043bb4b -s ours am skip reason: Merged-In Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19 with SHA-1 66372d2c44 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15241579 Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15843431 Change-Id: I684f7c72ba2a2ed427275f144d9d61600124fdf0
| | | * Revert "Add standalone ART gtests to `TEST_MAPPING` group `presubmit`."Roland Levillain2021-09-272-87/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 66372d2c444b1badaa0e3972001dea3f31c0d339. Reason for revert: Some standalone ART gtests are failing in presubmits when built from sources where the Oat file version has been updated -- compared to current prebuilt ART APEXes -- and run against such a prebuilt ART APEX, that does not include that Oat version change. Test: Rely on TreeHugger presubmits Bug: 193218514 Bug: 152379281 Bug: 194403904 Change-Id: I88a9e7801dcc98940209d361af385bdcbb6e5099 Merged-In: Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19
| * | | [automerger skipped] Revert "Add standalone ART gtests to `TEST_MAPPING` ↵Roland Levillain2021-09-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group `mainline-presubmit`." am: 1eb37aaa03 -s ours am: 0c854fa96b -s ours am skip reason: Merged-In Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19 with SHA-1 66372d2c44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15836038 Change-Id: Iab7ace1d55dbca767e0dc1dfca46b727e556c284
| | * | [automerger skipped] Revert "Add standalone ART gtests to `TEST_MAPPING` ↵Roland Levillain2021-09-270-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group `mainline-presubmit`." am: 1eb37aaa03 -s ours am skip reason: Merged-In Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19 with SHA-1 66372d2c44 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15836038 Change-Id: Icbb80531e1c3c1f712d41a0b6398462435220e25
| | | * Revert "Add standalone ART gtests to `TEST_MAPPING` group `mainline-presubmit`."Roland Levillain2021-09-272-58/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 506b64c3b001dc32c59b8e63ce2e6d6cf4451fcb. Reason for revert: Some standalone ART gtests are failing in presubmits when built from sources where the Oat file version has been updated -- compared to current prebuilt ART APEXes -- and run against such a prebuilt ART APEX, that does not include that Oat version change. Test: Rely on TreeHugger presubmits Bug: 193218514 Bug: 152379281 Bug: 194403904 Change-Id: I6166e7146a4bd07fce8acde381caa9a741ecc254 Merged-In: Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19
* | | | Snap for 7766737 from a237bffc9ab5f8c9a5d0be81cace6e0b08fb7e0f to sc-v2-releaseAndroid Build Coastguard Worker2021-09-258-81/+171
|\| | | | | | | | | | | | | | | Change-Id: I4c8cc822b8adeb281ef89a5e1f2989039c54e4c7
| * | | Always check for an exception after a class lookup. am: 7425a437deNicolas Geoffray2021-09-248-81/+171
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15898695 Change-Id: Iff40e9c4fdef0a3418daa95ac4bf3bf03dc94075
| | * | Always check for an exception after a class lookup.Nicolas Geoffray2021-09-248-81/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we need to stop the lookup, as an exception is pending. (cherry picked from commit 36d182089a4ced3603c7cdcb61b2d92a5a76a471) Test: 831-unverified-bcp Bug: 195766785 Merged-In: I8aa65f6bbaae83eff0be7ca5d82e0c0a548b5b60 Change-Id: I3e414f75e7081eb93b8cb5af89859d25492edf10
* | | | Snap for 7756953 from a0a59261549bfa4f88340a52466aa2b43ba972b7 to sc-v2-releaseAndroid Build Coastguard Worker2021-09-220-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I6e9b82304326834dc4e5846f2ebaa5f1c4feba14
| * | | Update .oat version after disabling partial LSE. am: 8b27ea0005 am: 399fa51d31Nicolas Geoffray2021-09-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15836008 Change-Id: I8e0a17f0610d84cc267fc2f73168e308fb067dea
| | * | Update .oat version after disabling partial LSE. am: 8b27ea0005Nicolas Geoffray2021-09-220-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15836008 Change-Id: I0de7810c1afb28ca44a418b448fb413d8823fc48
| | | * Update .oat version after disabling partial LSE.Nicolas Geoffray2021-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure we don't take any .oat file that has the bogus generated code. (cherry picked from commit 776a1c1447be1e504c2013c5d170d08ef4907d7f) (cherry picked from commit 8246b0cbfd4c5e19596e2dac0c1377c56f444d5f) Test: test.py Bug: 197981962 Merged-In: Ic14d18d310bdcd408c1f6e2777ef53a041fb2f12 Change-Id: Ic66ee1998f490c15b95279f3b4881f9581772190
| * | | Temporarily disable partial LSE. am: 86be262a3d am: 8d6e9fea8bNicolas Geoffray2021-09-220-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15836007 Change-Id: I5c9140579f89c27ae357f78d5bcc856abdb67d09
| | * | Temporarily disable partial LSE. am: 86be262a3dNicolas Geoffray2021-09-220-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15836007 Change-Id: Ic2e1ca7735ef01cd02a3c58e798d5a095b07bc15
| | | * Temporarily disable partial LSE.Nicolas Geoffray2021-09-157-269/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in it. Add a regression test. (cherry picked from commit 18074d2b59ae56dcfccea770ceb515215c8eb53f) (cherry picked from commit a38b7355a603772424a8212840849094ce0ddeb3) Bug: 197818595 Test: 828-partial-lse Merged-In: I65da4f7ef09cd2a1f6c4b21799ecd7a42c1adac2 Change-Id: I3eb52dc091264e617bb711260fb4950d15c7f50b
* | | | Snap for 7731944 from 46c6617f075520fa69b0f0dd52006a7e10062876 to sc-v2-releaseAndroid Build Coastguard Worker2021-09-1417-295/+199
|\| | | | | | | | | | | | | | | Change-Id: I269d313fb3f83322d28007f4245b3996dff097ae
| * | | Update .oat version after disabling partial LSE. am: 020c79e5f2Nicolas Geoffray2021-09-141-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15827548 Change-Id: I5a9157ae73bc855ff801b5d49b3613613eebc4a9
| | * | Update .oat version after disabling partial LSE.Nicolas Geoffray2021-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure we don't take any .oat file that has the bogus generated code. (cherry picked from commit 776a1c1447be1e504c2013c5d170d08ef4907d7f) (cherry picked from commit 8246b0cbfd4c5e19596e2dac0c1377c56f444d5f) Test: test.py Bug: 197981962 Merged-In: Ic14d18d310bdcd408c1f6e2777ef53a041fb2f12 Change-Id: Ic66ee1998f490c15b95279f3b4881f9581772190
| * | | Temporarily disable partial LSE. am: a5f978ceb3Nicolas Geoffray2021-09-147-269/+60
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15825867 Change-Id: I8f59b0e2c37ed27c731813d66c7092494907531e
| | * | Temporarily disable partial LSE.Nicolas Geoffray2021-09-147-269/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in it. Add a regression test. Bug: 197818595 Test: 828-partial-lse (cherry picked from commit 18074d2b59ae56dcfccea770ceb515215c8eb53f) (cherry picked from commit a38b7355a603772424a8212840849094ce0ddeb3) Merged-In: I65da4f7ef09cd2a1f6c4b21799ecd7a42c1adac2 Change-Id: I3eb52dc091264e617bb711260fb4950d15c7f50b
| * | | Partial LSE: handle all kinds of infinite loops. am: 9c70cdb384Nicolas Geoffray2021-09-135-8/+33
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15750021 Change-Id: I2544e0e0fe68ae02c42ab6f2bf0a85aa807b9c0f
| | * | Partial LSE: handle all kinds of infinite loops.Nicolas Geoffray2021-09-135-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A subgraph could also have an infinite loop. Test: 826-inifinite-loop Bug: 196246395 Merged-In: Ifd1e1ae0f42dfe2cc156386fc166101c20748fc9 (cherry picked from commit 96dadefd24331f6808cb287048269ba772423c33) Change-Id: I410ec26aefbc42629ba7dbe5a19a87399cefe396 (cherry picked from commit 1c7eeae26429bf76c47a1eaf6eddf514c000ba71)
| * | | vdex: add checks in the event of file corruption. am: 4667b35dbfNicolas Geoffray2021-09-134-16/+104
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15819162 Change-Id: I4286681edc87300f46751c249b0c0e0af6f85f6a
| | * | vdex: add checks in the event of file corruption.Nicolas Geoffray2021-09-134-16/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unclear yet why the vdex files are being corrupted. But system server, which is reading these vdex files should be robust to any vdex corruption. Bug: 199309980 Bug: 199395272 Test: test.py (cherry picked from commit a74a7071490e47e1b5590cc19726f1620fd0ee43) (cherry picked from commit a35586522fd398fb2845a9ae8427aa4853f155be) Merged-In: Ia85ab8b23a0be4069cfa058a86fdf561f1ceb432 Change-Id: I558238fd7cc0d7bc2f89f989ad53db8eb7a2eb24
* | | | Snap for 7712960 from 3ed44c06b35f59b27e04640f1a39b16989862b26 to sc-v2-releaseAndroid Build Coastguard Worker2021-09-085-13/+75
|\| | | | | | | | | | | | | | | Change-Id: Id3fe8fd04be00726972c38ac1323e7b48a5326fc
| * | | Add a lock contention palette hook. am: b2e6ae0e8bNicolas Geoffray2021-09-075-13/+75
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15754302 Change-Id: I40146c77813257223c51db185c1072e9d308888a
| | * | Add a lock contention palette hook.Nicolas Geoffray2021-09-075-13/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 196334695 Test: m Change-Id: Id87cfc30957baa5e575947fc69d6f307e843dcf8 Merged-In: Id87cfc30957baa5e575947fc69d6f307e843dcf8 (cherry picked from commit e261356db98dc27bcec4048b3eaf9834864169aa) (cherry picked from commit 977054f46299a940e4db186a99f91b14dd735576)
* | | | Snap for 7708232 from 5545dc3651116e8fde8155c57b93f4fb13350e63 to sc-v2-releaseAndroid Build Coastguard Worker2021-09-061-0/+17
|\| | | | | | | | | | | | | | | Change-Id: Ibe323c93e1c91ee6824a89a58b3101343c6a6c55
| * | | Allow visibility on libdexfile for all libdexfile_support users. am: 0cbb59743fMartin Stjernholm2021-09-061-0/+17
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15727125 Change-Id: I70f7299c63315f744c9e5afde2c49b446f04e4ee
| | * | Allow visibility on libdexfile for all libdexfile_support users.Martin Stjernholm2021-09-061-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a note that libdexfile_support users also need to depend on libdexfile. Manual cherry-pick from https://r.android.com/1810837. Ignore-AOSP-First: Cherry-picked from AOSP Test: m droid Bug: 197856821 Bug: 169779783 Change-Id: I80162942a6557b0309ccde28c058cdf66c1fa250 Merged-In: I80162942a6557b0309ccde28c058cdf66c1fa250
* | | | Snap for 7704922 from a937e28c58f4b088d9d92ca85a694eb291164286 to sc-v2-releaseAndroid Build Coastguard Worker2021-09-0413-44/+78
|\| | | | | | | | | | | | | | | Change-Id: I1694327147ef7bcf2f313939bfacf031c189ca52
| * | | Replace weak-ref access disable checkpoint with STW pause am: 8992f92aabLokesh Gidra2021-09-041-15/+35
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15754310 Change-Id: I6dd61857ab751eb2b2eff53385507381570dc3c9
| | * | Replace weak-ref access disable checkpoint with STW pauseLokesh Gidra2021-09-041-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling weak-ref access in ConcurrentCopying collector can lead to deadlocks. For instance, if mutator M1 acquires W1 mutex and then participates in the checkpoint and then gets blocked in getReferent(), waiting for the gc-thread to finish reference processing. Mutator M2 waits for M1 to release W1 so that it can acquire the mutex before participating in the checkpoint. On the other hand, GC-thread waits for M2 to finish checkpoint. A STW pause avoids the deadlock by ensuring that mutators are not blocked on weak-ref access before the pause, and GC-thread can make progress after the pause in reference processing. Bug: 195336624 Bug: 195261575 Test: art/test/testrunner/testrunner.py Merged-In: I03d6bcd4d53f37ec84064edd8292951d30f48eaf Change-Id: I03d6bcd4d53f37ec84064edd8292951d30f48eaf (cherry picked from commit 555eefef9a27995ef341cdf44ed60c61953e2e3f) (cherry picked from commit 16f1ef2d09e82d419a2a51ac3d7f7fb7e9553dd1)
| * | | Do not acquire runtime_shutdown_lock_ in Abort() am: d4da905ba1Hans Boehm2021-09-042-5/+13
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15754305 Change-Id: I54b78ea75590a453dcbe47ea599c849e878dd48b
| | * | Do not acquire runtime_shutdown_lock_ in Abort()Hans Boehm2021-09-042-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abort can be called, particularly in OOM situations, when we already hold the lock. Abort() should minimize the locks it acquires. This is intended to be a minimal, low-risk change. Generated code should be essentially unchanged, except in Abort(). This does not address the question of whether IsShuttingDown really needs to lock at all. Test: Build and boot AOSP. Bug: 195884830 Merged-In: I0ee4a7ca7348153436fec0fecc1d1f2ca1f7a30c (cherry picked from commit 70aa29e2d93ba66e71a8ff88c9210719efae1c31) Change-Id: I9d7dca18bc480a37197bca3205834da13321cc58 (cherry picked from commit aefbed79a1e37d6901228b0a7e03ce63c2495703)
| * | | Improve suspension timeout diagnostic and fix race am: 1363c1bf72Hans Boehm2021-09-049-23/+29
| |\| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15754304 Change-Id: I19863c5ecf99a45bc58e36103da91ba61e8eef2a