summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-01-03Merge cherrypicks of ['googleplex-android-review.googlesource.com/25741139'] ↵aml_per_341410020android14-mainline-permission-releaseAndroid Build Coastguard Worker
into sparse-11193089-L91500030001057788. SPARSE_CHANGE: I541195adb0c9f6327858f9b68d35f68c822e5aa5 Change-Id: I5c3f2d932170b511e5d99dd9fd8c8a6c183d1599
2024-01-03Add "mts-permission" to CtsBackupHostTestCases since it's required by ↵Tongbo Liu
CtsBackupTestCases. Bug: 317762910 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3c6f7c3c63af778e599ffc0f5531ea38508b9fd2) Merged-In: I541195adb0c9f6327858f9b68d35f68c822e5aa5 Change-Id: I541195adb0c9f6327858f9b68d35f68c822e5aa5
2023-11-30Snap for 11155123 from 0493782ce30c4b63e526771b672b8a37c51036a6 to ↵Android Build Coastguard Worker
mainline-permission-release Change-Id: I9df54aa9c49a032ea1e0dcd4670672e2fa08a9f2
2023-11-29Merge changes from topic "am-f9f678616e16495aa92a52e7e093af0b" into ↵Automerger Merge Worker
android14-tests-dev am: 09ecd01438 am: 443fe27287 Original change: https://android-review.googlesource.com/c/platform/cts/+/2833659 Change-Id: I3ae235b208df3a601a483e4ad20892f2446502b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29[automerger skipped] Merge "[DO NOT MERGE]Skip the test DocumentsUI with ↵Treehugger Robot
UiAutomator on Wear." into android13-tests-dev am: a6aad93e5d -s ours am: 8d64e99c2e -s ours am: aa73db36d8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2833659 Change-Id: I001f9201c326cbcf657b31c79d40faa8c9300926 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge changes from topic "am-f9f678616e16495aa92a52e7e093af0b" into ↵Automerger Merge Worker
android14-tests-dev am: 09ecd01438 Original change: https://android-review.googlesource.com/c/platform/cts/+/2833659 Change-Id: I37d7e7f0b32fb9c012176b66f757e23b8479a6e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29[automerger skipped] Merge "[DO NOT MERGE]Skip the test DocumentsUI with ↵Treehugger Robot
UiAutomator on Wear." into android13-tests-dev am: a6aad93e5d -s ours am: 8d64e99c2e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2833659 Change-Id: Ibfa763dc4fcde25f54d4c6448986ea125ab37e73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge changes from topic "am-f9f678616e16495aa92a52e7e093af0b" into ↵Automerger Merge Worker
android14-tests-dev * changes: [automerger skipped] Merge "[DO NOT MERGE]Skip the test DocumentsUI with UiAutomator on Wear." into android13-tests-dev am: a6aad93e5d -s ours [automerger skipped] [DO NOT MERGE]Skip the test DocumentsUI with UiAutomator on Wear. am: e90ba19d64 -s ours
2023-11-29[automerger skipped] Merge "[DO NOT MERGE]Skip the test DocumentsUI with ↵Treehugger Robot
UiAutomator on Wear." into android13-tests-dev am: a6aad93e5d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2833659 Change-Id: I33dfcb7180c7128fc9cc5ff0541d876cdd7332b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29[automerger skipped] [DO NOT MERGE]Skip the test DocumentsUI with ↵Ankit Verma
UiAutomator on Wear. am: e90ba19d64 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2833659 Change-Id: Id8f8d78cbd09f8b476cf0091dae9af43f77cd6f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "[DO NOT MERGE]Skip the test DocumentsUI with UiAutomator on Wear." ↵Treehugger Robot
into android13-tests-dev
2023-11-29Merge "Exempt IME tests from preemptible IME config" into ↵Treehugger Robot
android14-tests-dev am: 2a4d92cf50 am: 05cc66a6bd Original change: https://android-review.googlesource.com/c/platform/cts/+/2851326 Change-Id: I5ca272fb2374a76eb355a3d3b041bb56d628dec4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Exempt IME tests from preemptible IME config" into ↵Treehugger Robot
android14-tests-dev am: 2a4d92cf50 Original change: https://android-review.googlesource.com/c/platform/cts/+/2851326 Change-Id: Ie5c90c7e9b7123b48ffc58a7fa377d42e58de04f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Exempt IME tests from preemptible IME config" into android14-tests-devTreehugger Robot
2023-11-29Merge "Merge "Don't run the VPN tests on watches." into android13-tests-dev ↵Automerger Merge Worker
am: bda911054d" into android14-tests-dev am: de833dfcab am: 01906fc8dd Original change: https://android-review.googlesource.com/c/platform/cts/+/2844056 Change-Id: I2158155c55255fb4ffcc3547412e2ea3aca33181 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge "Don't run the VPN tests on watches." into android13-tests-dev ↵Automerger Merge Worker
am: bda911054d" into android14-tests-dev am: de833dfcab Original change: https://android-review.googlesource.com/c/platform/cts/+/2844056 Change-Id: Ica1a5e3fde107ec31e553d625fde8d92d09e0010 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge "Don't run the VPN tests on watches." into android13-tests-dev ↵Automerger Merge Worker
am: bda911054d" into android14-tests-dev
2023-11-29Merge "Don't run the VPN tests on watches." into android13-tests-dev am: ↵Treehugger Robot
bda911054d Original change: https://android-review.googlesource.com/c/platform/cts/+/2844056 Change-Id: I1ce682f382f016ce1af723ff9172558bc3c0317a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Collects supported device states from DeviceStateManager" into ↵Kenneth Ford
android14-tests-dev am: 32136f4742 am: fad0a5db8d Original change: https://android-review.googlesource.com/c/platform/cts/+/2825090 Change-Id: Iba912daaedfcaf12b22be60db5b5e8c805aa90d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Don't run the VPN tests on watches." into android13-tests-devTreehugger Robot
2023-11-29Exempt IME tests from preemptible IME configNikolas Havrikov
The tests in question are not compatible with the config_preventImeStartupUnlessTextEditor configuration option as they expect IME connections to be started, which does not happen with the setting activated. Bug: 309378031 Test: atest ImeInsetsVisibilityTest InputMethodServiceTest Test: atest SearchViewTest FocusHandlingTest Change-Id: I2dfcb118b8f96d988c1fd2c9aefc98e2b1f9e872 Merged-In: I2dfcb118b8f96d988c1fd2c9aefc98e2b1f9e872
2023-11-29Merge "Collects supported device states from DeviceStateManager" into ↵Kenneth Ford
android14-tests-dev am: 32136f4742 Original change: https://android-review.googlesource.com/c/platform/cts/+/2825090 Change-Id: I7d3b2a35e4025156f054930f379855f6d25167cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Collects supported device states from DeviceStateManager" into ↵Kenneth Ford
android14-tests-dev
2023-11-28Merge "Camera: Update MULTI_CAMERA requirement in MPC" into ↵Shuzhen Wang
android14-tests-dev am: 72475acd52 am: 8c55a5b737 Original change: https://android-review.googlesource.com/c/platform/cts/+/2844504 Change-Id: I66bf4a628d88e95ba090f73c0a33efb66348d33f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Camera: Update MULTI_CAMERA requirement in MPC" into ↵Shuzhen Wang
android14-tests-dev am: 72475acd52 Original change: https://android-review.googlesource.com/c/platform/cts/+/2844504 Change-Id: I01eb8f631b4b49a75858e3003770eba2e6184921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Camera: Update MULTI_CAMERA requirement in MPC" into android14-tests-devShuzhen Wang
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/179042963" into ↵Treehugger Robot
tm-dev am: 6f4b53d77a am: 9186d11755 am: 3b7fa6a62b -s ours am: 0ec1febc1d -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 5ef01fc992 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24240210 Change-Id: Ia3a9c4b54c6b31a9b9d112196f807d41dcb702aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/229256049" into ↵Treehugger Robot
tm-dev am: 122a9b4d05 am: adc36fbed5 am: 99ff1e188f -s ours am: 1af132c899 -s ours am skip reason: Merged-In Ib24ee5391ae02bec94ef0cf937c8a17d5e76a221 with SHA-1 8b3857ab52 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23807534 Change-Id: I2c210769bc96d95de15878ffca74f6b8bb0e774e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "[RESTRICT AUTOMERGE] Autofill add STS tests to ↵Tim Yu
guard against RemoteView spills" into udc-dev am: e94b0a7fa6 -s ours am skip reason: Merged-In I195332fe356f8a9428a94518b7c3631df9705cb9 with SHA-1 704f167057 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24747726 Change-Id: I80ddfc178f29c99ed3f33c10f488967c0758c71d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] [RESTRICT AUTOMERGE] Autofill add STS tests to guard ↵Tim Yu
against RemoteView spills am: 758c857456 -s ours am skip reason: Merged-In I195332fe356f8a9428a94518b7c3631df9705cb9 with SHA-1 704f167057 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24747726 Change-Id: I55e600cb07f5029323412b337abdb9311efdd7be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/179042963" into ↵Treehugger Robot
tm-dev am: 6f4b53d77a am: 9186d11755 am: 3b7fa6a62b -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 5ef01fc992 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24240210 Change-Id: Iddbd456850519f04996cddae1745f91022fc0599 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/229256049" into ↵Treehugger Robot
tm-dev am: 122a9b4d05 am: adc36fbed5 am: 99ff1e188f -s ours am skip reason: Merged-In Ib24ee5391ae02bec94ef0cf937c8a17d5e76a221 with SHA-1 8b3857ab52 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23807534 Change-Id: If8006892e3b5530f7e0239cd122c9f6de36e9b64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "[RESTRICT AUTOMERGE] Autofill add STS tests to guard against ↵Tim Yu
RemoteView spills" into udc-dev
2023-11-28[automerger skipped] Merge "[RESTRICT AUTOMERGE] Autofill add STS tests to ↵Tim Yu
guard against RemoteView spills" into tm-qpr-dev am: b9ec5ca00e -s ours am: be2061f223 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24748571 Change-Id: I5dce0080616536167014a171755b784f34ce159a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] [RESTRICT AUTOMERGE] Autofill add STS tests to guard ↵Tim Yu
against RemoteView spills am: 704f167057 -s ours am: dd788c3759 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24748571 Change-Id: Iebdfde939583c38037c5889c9016a712f015853b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "RESTRICT AUTOMERGE Test that injecting to the input filter requires ↵Daniel Norman
INJECT_EVENTS." into udc-dev am: 8a5d2528d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25412991 Change-Id: If78ec54d9b76d1639a646b887074402a4886f66a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28RESTRICT AUTOMERGE Test that injecting to the input filter requires ↵Daniel Norman
INJECT_EVENTS. am: 5953647238 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25412991 Change-Id: I75702b38ece8d02b0c27bb2612b7cf96511f0a47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/179042963" into ↵Treehugger Robot
tm-dev am: 6f4b53d77a am: 08a8ca71b3 -s ours am: 21e135c288 -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 719bcca6d9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24240210 Change-Id: Iddc7a49cdaa9da5dfa64c060e0c2690b463cc071 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/229256049" into ↵Treehugger Robot
tm-dev am: 122a9b4d05 am: 9b4d0d2c42 -s ours am: 3c0895a7c8 -s ours am skip reason: Merged-In Ib24ee5391ae02bec94ef0cf937c8a17d5e76a221 with SHA-1 fce038b724 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23807534 Change-Id: I03649a7978c5e3d733e2810c0a4faa15a9d87332 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "[RESTRICT AUTOMERGE] Autofill add STS tests to ↵Tim Yu
guard against RemoteView spills" into tm-qpr-dev am: b9ec5ca00e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24748571 Change-Id: I3583ece086a2138193543fdb190169f2a846129a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] [RESTRICT AUTOMERGE] Autofill add STS tests to guard ↵Tim Yu
against RemoteView spills am: 704f167057 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24748571 Change-Id: I43158a271c1685a1d289cc3e46a58d7501a82edd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "RESTRICT AUTOMERGE Test that injecting to the input filter requires ↵Daniel Norman
INJECT_EVENTS." into udc-dev
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/179042963" into ↵Treehugger Robot
tm-dev am: 6f4b53d77a am: 08a8ca71b3 -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 719bcca6d9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24240210 Change-Id: I749500b8516ea1661855428ed86feaea3262366b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28[automerger skipped] Merge "CTS test for Android Security b/229256049" into ↵Treehugger Robot
tm-dev am: 122a9b4d05 am: 9b4d0d2c42 -s ours am skip reason: Merged-In Ib24ee5391ae02bec94ef0cf937c8a17d5e76a221 with SHA-1 fce038b724 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23807534 Change-Id: I1587396dbf9de81b4a8c0adbd1c0d4f97ca63a24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Improve test invokeOnColorsChangedListenerTest_clearLock" into ↵Aurélien Pomini
android14-tests-dev am: b6cfdace1a am: d6104484ae Original change: https://android-review.googlesource.com/c/platform/cts/+/2832695 Change-Id: I2d7f943deed2953d23d06e741e6d6ef0611fa719 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "CTS test for Android Security b/179042963" into tm-dev am: 6f4b53d77a ↵Treehugger Robot
am: 9186d11755 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24240210 Change-Id: Ia6d3ee197d6d9d0204bd5922acda00e00bf1d2af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "CTS test for Android Security b/229256049" into tm-dev am: 122a9b4d05 ↵Treehugger Robot
am: adc36fbed5 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23807534 Change-Id: I3c571037b5f6f4feb6ce2351be2e0e7bb9dc7444 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "[RESTRICT AUTOMERGE] Autofill add STS tests to guard against ↵Tim Yu
RemoteView spills" into tm-qpr-dev
2023-11-28Merge "CTS test for Android Security b/179042963" into tm-dev am: 6f4b53d77aTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24240210 Change-Id: Ia972a6a8dbe3d3c18d4b7391f2fd701dc2e3f6d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "CTS test for Android Security b/179042963" into tm-dev am: 6f4b53d77aTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24240210 Change-Id: Idc0ddf25ef002e36ce2db69825471a327a30d7db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>