aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-29Snap for 10412612 from b84f9d8d5e5c2a85ef1ee1292ca3acfc92a448d3 to ↵android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseAndroid Build Coastguard Worker
udc-d1-release Change-Id: Ic4c3236a2d7df6a2e3026bea2ac23506a32feb01
2023-06-28Snap for 10402775 from f9d0d7d8d599e94b22365ff43017b5c487b6f492 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I70d168b22ff6a0e522b0d6b82a847ba9001ae90e
2023-06-28[automerger skipped] Merge "Use new android versions support in robolectric, ↵Kevin Liu
and new android specific SdkProvider in test/robolectric-extensions." into tm-dev am: 5737b91a1b am: a45ef41419 am: 3a6ef6f857 -s ours am: bfe81a2f3e -s ours am skip reason: Merged-In If14d4eff9b26f739682fadf5b8e2a5500c528051 with SHA-1 ff225c03a9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23579496 Change-Id: Id668722e58d5ccaca3008a931632a6383e6976ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28[automerger skipped] Merge "Use new android versions support in robolectric, ↵Kevin Liu
and new android specific SdkProvider in test/robolectric-extensions." into tm-dev am: 5737b91a1b am: ac76e6685f -s ours am: 7819faddfe -s ours am skip reason: Merged-In If14d4eff9b26f739682fadf5b8e2a5500c528051 with SHA-1 c84212a9f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23579496 Change-Id: I7427165f0e641f3d9993c8098e3b56d7099e3769 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28[automerger skipped] Merge "Use new android versions support in robolectric, ↵Kevin Liu
and new android specific SdkProvider in test/robolectric-extensions." into tm-dev am: 5737b91a1b am: a45ef41419 am: 3a6ef6f857 -s ours am skip reason: Merged-In If14d4eff9b26f739682fadf5b8e2a5500c528051 with SHA-1 ff225c03a9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23579496 Change-Id: I80eb344ea84e85ef8a7839a2955591f1df8a3f15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Use new android versions support in robolectric, and new android ↵Kevin Liu
specific SdkProvider in test/robolectric-extensions." into tm-dev am: 5737b91a1b am: a45ef41419 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23579496 Change-Id: Id2b2fe29eb4763486a76b23cc68856bb777ab055 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28[automerger skipped] Merge "Use new android versions support in robolectric, ↵Kevin Liu
and new android specific SdkProvider in test/robolectric-extensions." into tm-dev am: 5737b91a1b am: ac76e6685f -s ours am skip reason: Merged-In If14d4eff9b26f739682fadf5b8e2a5500c528051 with SHA-1 c84212a9f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23579496 Change-Id: I729b6a53b4f6856b4c0cf371af66566f1691ba66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Use new android versions support in robolectric, and new android ↵Kevin Liu
specific SdkProvider in test/robolectric-extensions." into tm-dev am: 5737b91a1b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23579496 Change-Id: Id706beda298d92a397cfb887e33c76ecc31cdd0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Use new android versions support in robolectric, and new android ↵Kevin Liu
specific SdkProvider in test/robolectric-extensions." into tm-dev am: 5737b91a1b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23579496 Change-Id: Ic5c6b1cc5d6d0b50210a36ad9c7d951681019a72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Merge "Use new android versions support in robolectric, and new android ↵Kevin Liu
specific SdkProvider in test/robolectric-extensions." into tm-dev
2023-06-28[automerger skipped] Address TODO in b/288311989 am: e71234e1fa am: ↵Kevin Liu
af1f4296f5 am: 566afce123 -s ours am: 89c3266ed5 -s ours am skip reason: Merged-In I707233b8880d32814d710535885ba4377a8907c5 with SHA-1 e71234e1fa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647 Change-Id: I1d3bc5d4f1c8dd586a85fb824e119f4ff1afa2e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Address TODO in b/288311989 am: e71234e1fa am: 8c07b36491 am: ee36766168Kevin Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647 Change-Id: Ibee33cee098600780f77b010804830b6c7a1b761 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28[automerger skipped] Address TODO in b/288311989 am: e71234e1fa am: ↵Kevin Liu
af1f4296f5 am: 566afce123 -s ours am skip reason: Merged-In I707233b8880d32814d710535885ba4377a8907c5 with SHA-1 e71234e1fa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647 Change-Id: I35e03c0b5ceb17b4e8a9d42925b063c8794afe80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Address TODO in b/288311989 am: e71234e1fa am: af1f4296f5Kevin Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647 Change-Id: Ifa03508da2026b8df77052c5af171af2a153073c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Address TODO in b/288311989 am: e71234e1fa am: 8c07b36491Kevin Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647 Change-Id: I2be09a22e4b018b92ecda3ec72adcd70960f2c07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Address TODO in b/288311989 am: e71234e1faKevin Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647 Change-Id: Ic9031994a2f0d9d0147a1be5226a715f9fb7682b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28Address TODO in b/288311989 am: e71234e1faKevin Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647 Change-Id: I3932d4c56ea20bb749143837895bae237ce41ed6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27Address TODO in b/288311989Kevin Liu
Restored the AndroidTestEnvironment code to be synced with master Bug: 283664894 Test: mma && atest ClockworkSystemUIRoboTests Change-Id: I707233b8880d32814d710535885ba4377a8907c5 Merged-In: I707233b8880d32814d710535885ba4377a8907c5
2023-06-24Snap for 10375345 from eb71f6674032744445d184838416f2723c6d68d4 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I5145011be40fedc6b8cb57673cb1eef6407a7938
2023-06-23Merge "Copy two tests in the mentioning bugs for test coverage." into ↵Ang Li
udc-dev am: 96f1545038 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23781811 Change-Id: I51c7422c95ff856e019981d49b27c55672bcfa2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23Merge "Copy two tests in the mentioning bugs for test coverage." into udc-devAng Li
2023-06-23[automerger skipped] Merge branch 'upstream-google' into rng_import am: ↵Ram Peri
010ed742ac am: 4d2e52ae14 am: 088995a29a -s ours am: b01c064efc -s ours am skip reason: Merged-In I493c1e89a6b0d179477e9be4427235aa789d5051 with SHA-1 010ed742ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23782705 Change-Id: I816fb9d8c6d5241d794ed537196c2145f2af8f05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23[automerger skipped] Merge branch 'upstream-google' into rng_import am: ↵Ram Peri
010ed742ac am: bcf8a5417d -s ours am: 2609d7aba7 -s ours am skip reason: Merged-In I493c1e89a6b0d179477e9be4427235aa789d5051 with SHA-1 79d7d20702 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23782705 Change-Id: Iae86a318bcce894c4d01984d0796b08f89c527dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23[automerger skipped] Merge branch 'upstream-google' into rng_import am: ↵Ram Peri
010ed742ac am: 4d2e52ae14 am: 088995a29a -s ours am skip reason: Merged-In I493c1e89a6b0d179477e9be4427235aa789d5051 with SHA-1 010ed742ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23782705 Change-Id: I96af1b683ef5866314efc7dd10fd526682ab5053 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23Use new android versions support in robolectric, and new android specific ↵Rex Hoffman
SdkProvider in test/robolectric-extensions. Prep for getting the code in sync on all branches/google3 Test: mma platform testing robotests Bug: 283664894 Change-Id: If14d4eff9b26f739682fadf5b8e2a5500c528051 Merged-In: If14d4eff9b26f739682fadf5b8e2a5500c528051
2023-06-23Merge branch 'upstream-google' into rng_import am: 010ed742ac am: 4d2e52ae14Ram Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23782705 Change-Id: Iefab69ecdf5bd310eb7788e8d969a712769f9784 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23[automerger skipped] Merge branch 'upstream-google' into rng_import am: ↵Ram Peri
010ed742ac am: bcf8a5417d -s ours am skip reason: Merged-In I493c1e89a6b0d179477e9be4427235aa789d5051 with SHA-1 79d7d20702 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23782705 Change-Id: I1d6ac16a6d8094cbcae16fa46476635c11896ada Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge branch 'upstream-google' into rng_import am: 010ed742acRam Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23782705 Change-Id: I651915ea845f1cab07021f08517477d32fcb5902 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge branch 'upstream-google' into rng_import am: 010ed742acRam Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23782705 Change-Id: I56abe699b476956eeb1bfa6319c247e3e8dab36b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Snap for 10367856 from 5b02297e3f20241141a801fd5a71a1c530e865a3 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ib19c3e3c0607869ba8e31ac9fef412af3a8a482c
2023-06-22[automerger skipped] Merge branch 'upstream-google' into tm_sync am: ↵Ram Peri
4947f39c8e am: 25f2c34c48 am: 26bf2e9007 -s ours am: c7c85715bd -s ours am skip reason: Merged-In Ic205da6e976c3c7cb1b91c332ddfd22d906ffe51 with SHA-1 4947f39c8e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23678598 Change-Id: Ida8c96a9109b071f9ad24f56322c3a95973edc99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22[automerger skipped] Merge branch 'upstream-google' into tm_sync am: ↵Ram Peri
4947f39c8e am: e9191fd6c0 -s ours am: 06a578446a -s ours am skip reason: Merged-In Ic205da6e976c3c7cb1b91c332ddfd22d906ffe51 with SHA-1 6ac1845fa7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23678598 Change-Id: I2c2f4edd26ab51da219433cd9918610a720fe77a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22[automerger skipped] Merge branch 'upstream-google' into tm_sync am: ↵android14-devRam Peri
4947f39c8e am: 25f2c34c48 am: 26bf2e9007 -s ours am skip reason: Merged-In Ic205da6e976c3c7cb1b91c332ddfd22d906ffe51 with SHA-1 4947f39c8e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23678598 Change-Id: Id0af02ac25a056cfc47aeb23b793c26a6419e669 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge branch 'upstream-google' into tm_sync am: 4947f39c8e am: 25f2c34c48Ram Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23678598 Change-Id: I1a85fa4529c8d03ca3df325d4f5245f23ea7cbbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22[automerger skipped] Merge branch 'upstream-google' into tm_sync am: ↵Ram Peri
4947f39c8e am: e9191fd6c0 -s ours am skip reason: Merged-In Ic205da6e976c3c7cb1b91c332ddfd22d906ffe51 with SHA-1 6ac1845fa7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23678598 Change-Id: I69291bdc007ec1f6dc4a0d81436ccb9aee351807 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge branch 'upstream-google' into rng_importRam Peri
Test: atest -c MyRoboTests Bug: 284193357 Change-Id: I493c1e89a6b0d179477e9be4427235aa789d5051 Merged-In: I493c1e89a6b0d179477e9be4427235aa789d5051
2023-06-22Merge branch 'upstream-google' into tm_sync am: 4947f39c8eRam Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23678598 Change-Id: I44d3b1c3709b33532fd6bae5f1419d8330ab5735 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Merge branch 'upstream-google' into tm_sync am: 4947f39c8eRam Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23678598 Change-Id: Ic794f810f0bfc294652a6b86528b3597a5d0ebf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22Copy two tests in the mentioning bugs for test coverage.Ang Li
Currently all tests in these two test files are disabled b/c of one single test failure each. This CL made copies to these two files, disabled the questionable tests to gain test coverage. Bug: 286353719 Bug: 286353161 Test: http://ab/I99600010172534051 Change-Id: Iaaeed16eae0e11610b41ae5e505f34c88bb264d9
2023-06-21Merge branch 'upstream-google' into tm_syncRam Peri
Test: atest -c MyRoboTests Bug: 281899632 Merged-In: Ic205da6e976c3c7cb1b91c332ddfd22d906ffe51 Change-Id: Ic205da6e976c3c7cb1b91c332ddfd22d906ffe51 (cherry picked from commit 6ac1845fa74f5198eb05b78324d0d27e4956c99e)
2023-06-21Snap for 10353909 from bd4fca46b8505ecccb752b79244a84e7a3bcf3a9 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ia4eb031abacefa57f6a3437407cede78cb4532f5
2023-06-20[automerger skipped] Merge branch 'upstream-google' into rng_import18 am: ↵Ram Peri
a99b56cbdb am: 2edb657eba am: a34eebacad -s ours am: ed45de13d0 -s ours am skip reason: Merged-In Ife59e70205fa3b8dd3aa4cdef4689a8fd276073c with SHA-1 a99b56cbdb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011 Change-Id: I790b9ae6c6ace244d3e8f92c43489bba6d75be85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20[automerger skipped] Merge branch 'upstream-google' into rng_import18 am: ↵Ram Peri
a99b56cbdb am: 95ace1ade5 -s ours am: 7e72768ebc -s ours am skip reason: Merged-In Ife59e70205fa3b8dd3aa4cdef4689a8fd276073c with SHA-1 6660b73edd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011 Change-Id: I62c89c7988879e067338521a4887683964f9eee4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20[automerger skipped] Merge branch 'upstream-google' into rng_import18 am: ↵Ram Peri
a99b56cbdb am: 2edb657eba am: a34eebacad -s ours am skip reason: Merged-In Ife59e70205fa3b8dd3aa4cdef4689a8fd276073c with SHA-1 a99b56cbdb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011 Change-Id: I33046dccfce74e580aba5c438bee4af202bbe342 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge branch 'upstream-google' into rng_import18 am: a99b56cbdb am: 2edb657ebaRam Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011 Change-Id: I7d3900f63823090269c6ae2c7fc099625b43f511 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20[automerger skipped] Merge branch 'upstream-google' into rng_import18 am: ↵Ram Peri
a99b56cbdb am: 95ace1ade5 -s ours am skip reason: Merged-In Ife59e70205fa3b8dd3aa4cdef4689a8fd276073c with SHA-1 6660b73edd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011 Change-Id: I231285f45ab06c9772f2ca386dbf9365938843f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge branch 'upstream-google' into rng_import18 am: a99b56cbdbRam Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011 Change-Id: I3058305aa3565a76ff886f953e5b65a6c37db6c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge branch 'upstream-google' into rng_import18 am: a99b56cbdbRam Peri
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23691011 Change-Id: Icbbcda56ac31a543a9c9496ad0eaee5a90f1272d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge branch 'upstream-google' into rng_import18Ram Peri
Test: atest -c MyRoboTests Bug: 281899632 Merged-In: Ife59e70205fa3b8dd3aa4cdef4689a8fd276073c Merged-In: Icd6f0f022a103c2384c8f01d78867f72646320dd Change-Id: Ife59e70205fa3b8dd3aa4cdef4689a8fd276073c (cherry picked from commit 6660b73edd97a19ea275f13329641cc28d474ce1)
2023-06-14Snap for 10323121 from 9bdfbc6aeb4696e5155ddb19f9fd4c3b7c33f414 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I272296a6dbc2c52e4061e73cd248f0cb3ab5d308
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 08:16:12 +0000