summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-25Merge cherrypicks of ['googleplex-android-review.googlesource.com/22746066'] ↵android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseAndroid Build Coastguard Worker
into tm-qpr3-c-release. Change-Id: I38e31ddc008c10b08a3932bd14eadbe1fa4c45c0
2023-04-25DO NOT MERGE Skip part of testRejectThenErrorFromForegroundActivity ↵Jeff Pu
(acquired info) for T releases (check b/274869473 for reasons). Full test converage is restored in U. Bug: b/274869473 Test: atest android.server.biometrics.fingerprint.FingerprintServiceTest#testRejectThenErrorFromForegroundActivity (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3842e809ddbcf554713e4df147113cfb2d1efb5b) Merged-In: I9aac81f28b4d90da4a889987e6c0b11b62b6696b Change-Id: I9aac81f28b4d90da4a889987e6c0b11b62b6696b
2023-04-14Snap for 9936701 from 655d3feb1a1ed06503b386c0f38f55735d172de7 to ↵Android Build Coastguard Worker
tm-qpr3-c-release Change-Id: Ic17cc307c0a4580a6de3e7cc0c0c60b022162a9b
2023-04-14Snap for 9929149 from 46a74830cc89ff432156edc4a79aa1a6cad6ac43 to ↵Android Build Coastguard Worker
tm-qpr3-c-release Change-Id: I2ee549e4f5c0a813d57d3f8fb4a417c1b5738db7
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: ↵Treehugger Robot
deeca962a7 am: bc79b99ca6 am: d917970ed2 am: d41e268d16 am: 677a6812b0 am: 25315c8c90 am: 32c14018bf Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22240747 Change-Id: I3f5ec567965d3c058f6b2f3faacb1ed5b70f5d93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: ↵Treehugger Robot
deeca962a7 am: bc79b99ca6 am: d917970ed2 am: d41e268d16 am: 677a6812b0 am: 25315c8c90 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22240747 Change-Id: I1d4a85419a3a4301b77c2d3a2c082036b6af6237 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: ↵Treehugger Robot
deeca962a7 am: bc79b99ca6 am: d917970ed2 am: d41e268d16 am: 677a6812b0 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22240747 Change-Id: Ibcfea1db40855f2efa58786b28de878bdd1ed820 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress." into android13-tests-dev am: 002e8ef54c am: 652b18073a am: c72fa57943 Original change: https://android-review.googlesource.com/c/platform/cts/+/2534640 Change-Id: I575c0e8db028d7ba1bb8ad994a23d21c5656a702 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress. am: 19cef0b72b am: 76d77c35a4 am: f096ff0855 Original change: https://android-review.googlesource.com/c/platform/cts/+/2534640 Change-Id: I75ac5da045691ffd4793466aefae1af797776ee7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: ↵Treehugger Robot
deeca962a7 am: bc79b99ca6 am: d917970ed2 am: d41e268d16 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22240747 Change-Id: If4dd154807ebf112640efed38521db401198b22c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress." into android13-tests-dev am: 002e8ef54c am: 652b18073a Original change: https://android-review.googlesource.com/c/platform/cts/+/2534640 Change-Id: I0532ee10d916219859d9bf0e69775f1db8f8a087 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress. am: 19cef0b72b am: 76d77c35a4 Original change: https://android-review.googlesource.com/c/platform/cts/+/2534640 Change-Id: Ia66a3947db165a25565b57f2b4f7af1a8ac9c759 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: ↵Treehugger Robot
deeca962a7 am: bc79b99ca6 am: d917970ed2 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22240747 Change-Id: Ib294f8c326fcc1198c27d672df215927aa800405 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress." into android13-tests-dev am: 002e8ef54c Original change: https://android-review.googlesource.com/c/platform/cts/+/2534640 Change-Id: I0d5757e1dabd17482a7ff144c2161bb348a297af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress. am: 19cef0b72b Original change: https://android-review.googlesource.com/c/platform/cts/+/2534640 Change-Id: I87d9c047325d219ca8aa9513242e2f35d08ad7ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: ↵Treehugger Robot
deeca962a7 am: bc79b99ca6 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22240747 Change-Id: I316b7bfb940c60eed6cd9aa247ce4ea983b9d619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress." into android13-tests-dev
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-dev am: ↵Treehugger Robot
deeca962a7 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22240747 Change-Id: Ibb649d681ccf1907f7ae1cdd8fb5ff2bf6651620 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Updated CTS test for Android Security b/271281996" into rvc-devTreehugger Robot
2023-04-12[DO NOT MERGE] Disable ↵Eric Zhang
ResumeOnRebootHostTest#resumeOnReboot_TwoUsers_BothUserUnlock_Success temporarily to unblock progress. Bug: 274707212 Test: atest CtsAppSecurityHostTestCases:ResumeOnRebootHostTest Change-Id: Ic4bac28163ad3557fbd9e4303496d906ce1a4803
2023-04-12Merge changes from topic "am-a97ee4447bba4041850b2486ebbb160c" into tm-dev ↵Automerger Merge Worker
am: 731acfc35b am: 3429a6f1ce Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: Id0bfea0b6405d10ba22f308bf6baac21361ac07d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into ↵Treehugger Robot
android13-tests-dev am: a979dbbaaa am: a96fa67779 am: 647b4bc2a0 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: If800c6b96257ff2019ce4d7bd1fbcdcd2f113a9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into ↵Treehugger Robot
android13-tests-dev am: a979dbbaaa am: d77263a4a6 am: 18529d38b9 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: I3a387a28053f906999990a7522d71c7cdda5f6f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5 am: 9019a3f410 am: ↵Tiffany Lee
3cf9208852 am: 00b147f010 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: I2fc049d5006bebc17d2b8464dc92453f4efd50bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge changes from topic "am-a97ee4447bba4041850b2486ebbb160c" into tm-dev ↵Automerger Merge Worker
am: 731acfc35b Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: Iea22ad42e18fcd0e63d47641c5c458c172b3c1ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into ↵Treehugger Robot
android13-tests-dev am: a979dbbaaa am: a96fa67779 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: Ia77f4a39fa8dbd216fced0c4763e9829c03c75de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into ↵Treehugger Robot
android13-tests-dev am: a979dbbaaa am: d77263a4a6 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: I8f8d1475e54ffabdd5e516c0096c7e4386611af2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5 am: 9019a3f410 am: ↵Tiffany Lee
3cf9208852 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: I6f17e661dbf4c78f9ff66856db672321263c942d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge changes from topic "am-a97ee4447bba4041850b2486ebbb160c" into tm-devAutomerger Merge Worker
* changes: Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into android13-tests-dev am: a979dbbaaa DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5 am: 9019a3f410
2023-04-12Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into ↵Treehugger Robot
android13-tests-dev am: a979dbbaaa Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: Ide1be7f190a4e917b534d5d371c92b065be184d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5 am: 9019a3f410Tiffany Lee
Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: Iac9a68b0f6b8504dbb2384761741a78cbf280996 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge changes from topic "am-691bd3476f544034a64039cd85c586aa" into ↵Automerger Merge Worker
android13-tests-dev am: a192a93f36 am: d82eb68ca8 am: 5907d9cc31 Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: I9043a9be93d72d4fc142518714ff72b3ff5e1fb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] Merge "DO NOT MERGE: Skip WiFi test in ↵Malek Naffati
CtsAppOpsTestCases module if feature not supported" into android12L-tests-dev am: cd5069e714 -s ours am: f1e3a0fafb -s ours am: f795437f9a -s ours am: 92b33a0536 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: I7f1e25f007801449df3e4a419e62d901c9650092 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into ↵Treehugger Robot
android13-tests-dev am: a979dbbaaa Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: Id8ee87e5bff58b3eb8dfd9815bbc655138af4024 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5 am: 9019a3f410Tiffany Lee
Original change: https://android-review.googlesource.com/c/platform/cts/+/2528739 Change-Id: I4e5222e7684cd178c14f0f9f5bf1dfc4a13301f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 13_R5" into ↵Treehugger Robot
android13-tests-dev
2023-04-12Merge changes from topic "am-691bd3476f544034a64039cd85c586aa" into ↵Automerger Merge Worker
android13-tests-dev am: a192a93f36 am: d82eb68ca8 Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: If3cef1d2b472edc46848919a48f8c24be963ca61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] Merge "DO NOT MERGE: Skip WiFi test in ↵Malek Naffati
CtsAppOpsTestCases module if feature not supported" into android12L-tests-dev am: cd5069e714 -s ours am: f1e3a0fafb -s ours am: f795437f9a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: I2f3c669a9363f7078a2ad186041e4dc281d23d44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge changes from topic "am-691bd3476f544034a64039cd85c586aa" into ↵Automerger Merge Worker
android13-tests-dev am: a192a93f36 Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: I7d4e9d06d2e88bc0778e1a8b36a1221607af6b44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] Merge "DO NOT MERGE: Skip WiFi test in ↵Malek Naffati
CtsAppOpsTestCases module if feature not supported" into android12L-tests-dev am: cd5069e714 -s ours am: f1e3a0fafb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: Id81b10733bee7517ec3ddce90274455c34f62ec6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge changes from topic "am-691bd3476f544034a64039cd85c586aa" into ↵Automerger Merge Worker
android13-tests-dev * changes: [automerger skipped] Merge "DO NOT MERGE: Skip WiFi test in CtsAppOpsTestCases module if feature not supported" into android12L-tests-dev am: cd5069e714 -s ours [automerger skipped] DO NOT MERGE: Skip WiFi test in CtsAppOpsTestCases module if feature not supported am: c5c2f5c387 -s ours
2023-04-12[automerger skipped] Merge "DO NOT MERGE: Skip WiFi test in ↵Malek Naffati
CtsAppOpsTestCases module if feature not supported" into android12L-tests-dev am: cd5069e714 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: Id6732522af079376fd039477174a980e3251fae4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] DO NOT MERGE: Skip WiFi test in CtsAppOpsTestCases ↵Manidhar
module if feature not supported am: c5c2f5c387 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2513196 Change-Id: Ic10e2db74b97860d5500d782a7c8a6375f46bf83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge "DO NOT MERGE: Skip WiFi test in CtsAppOpsTestCases module if feature ↵Malek Naffati
not supported" into android12L-tests-dev
2023-04-12Merge changes from topic "am-4c9d9ee0068d46dc82ba85c3d320d1b9" into ↵Automerger Merge Worker
android13-tests-dev am: 8992655257 am: 9b212ce925 am: 12dc578044 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528759 Change-Id: I8e94616ba62cb3b5937acb5b65a044c5b5b0ba3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier version ↵Treehugger Robot
to 12_R9" into android12-tests-dev am: b6e2bb8d71 -s ours am: 2633eed42b -s ours am: fbcdb13215 -s ours am: 30c988007a -s ours am: bf5ece1d77 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2528759 Change-Id: Id30ab22d9a28bca0a4a220a1168d31b9ab19b2bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge changes from topic "am-91ad15d0a68343cfa90d3fc4ca59a728" into ↵Automerger Merge Worker
android13-tests-dev am: 18eab9c2c2 am: 54d3815e6a am: e659fec586 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528761 Change-Id: I92d41407c2f342d94dd0ba72aa7f800a8e93e632 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to ↵Treehugger Robot
10_R17" into android10-tests-dev am: 297d546507 -s ours am: e165cc8166 -s ours am: 26f4e97552 -s ours am: f0ef01b868 -s ours am: e034962a3a -s ours am: 74f98b02f3 -s ours am: 37d1dd91e3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2528761 Change-Id: I0e6601fbd896413fe4d943b4aef9a7ac5fde4258 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12Merge changes from topic "am-4c9d9ee0068d46dc82ba85c3d320d1b9" into ↵Automerger Merge Worker
android13-tests-dev am: 8992655257 am: 9b212ce925 Original change: https://android-review.googlesource.com/c/platform/cts/+/2528759 Change-Id: Icc916fb3bcd4a65415cd197c008a491ffecce2fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier version ↵Treehugger Robot
to 12_R9" into android12-tests-dev am: b6e2bb8d71 -s ours am: 2633eed42b -s ours am: fbcdb13215 -s ours am: 30c988007a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2528759 Change-Id: Ib395e52811cb142ffc1a88379dc1eda0bfbd2193 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 12:27:18 +0000