summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-07Merge "Merge empty history for sparse-11681987-L44800030003690169" into ↵sparse_historyAndroid Build Coastguard Worker
sparse_history
2024-05-07Merge empty history for sparse-11681987-L44800030003690169Android Build Coastguard Worker
Change-Id: I3af14dbf5d83dc3615533b4d144b64f2dacf427f
2024-05-07Merge "Merge cherrypicks of ['android-review.googlesource.com/3077763'] into ↵Android Build Coastguard Worker
sparse-11681987-L44800030003690169. SPARSE_CHANGE: I276d6e9050ef924514ca349df1c2051a08cbb452" into sparse-11681987-L44800030003690169
2024-05-07Merge cherrypicks of ['android-review.googlesource.com/3077763'] into ↵Android Build Coastguard Worker
sparse-11681987-L44800030003690169. SPARSE_CHANGE: I276d6e9050ef924514ca349df1c2051a08cbb452 Change-Id: I3759e2adcf40dab5e8177cf06e0c1d5b49d08551
2024-05-07Merge "DO NOT MERGE: exclude failing test from cts-on-gsi" into ↵Android Build Coastguard Worker
snap-temp-L44800030003690169
2024-05-07DO NOT MERGE: exclude failing test from cts-on-gsiShubhangi Pawar
Bug: 334723936 (cherry picked from https://android-review.googlesource.com/q/commit:737bf1f2b3e402eb158d5b4162fe2045105b27d8) Merged-In: I276d6e9050ef924514ca349df1c2051a08cbb452 Change-Id: I276d6e9050ef924514ca349df1c2051a08cbb452
2024-05-03Merge "Merge empty history for sparse-11785893-L64700030003631552" into ↵Android Build Coastguard Worker
sparse_history
2024-05-03Merge empty history for sparse-11785893-L64700030003631552Android Build Coastguard Worker
Change-Id: Iaab1a217ffcb3182d3485bb2a14d9edb30c8b732
2024-05-03Merge "Merge cherrypicks of ['android-review.googlesource.com/3073510'] into ↵Android Build Coastguard Worker
sparse-11785893-L64700030003631552. SPARSE_CHANGE: Ib17f5684574d31618f114afada0a7f3c937ac781" into sparse-11785893-L64700030003631552
2024-05-03Merge cherrypicks of ['android-review.googlesource.com/3073510'] into ↵Android Build Coastguard Worker
sparse-11785893-L64700030003631552. SPARSE_CHANGE: Ib17f5684574d31618f114afada0a7f3c937ac781 Change-Id: I74bf94c38003f555193c9fe700407573ca4bba72
2024-05-03Merge "Test fix: check activity enabled state correctly" into ↵Android Build Coastguard Worker
snap-temp-L64700030003631552
2024-05-03Test fix: check activity enabled state correctlyPavel Grafov
pm.getActivityInfo().enabled is static state from the manifest rather than runtime state that is updated e.g. when BT activity get disabled due to a user restriction. To check the runtime state, it is necessary to use pm.getComponentEnabledSetting instead. Fixes: 331157573 Test: atest android.devicepolicy.cts.BluetoothTest (cherry picked from https://android-review.googlesource.com/q/commit:5b9be9cc7d71aa4822a521b2926ff3dae8807b8d) Merged-In: Ib17f5684574d31618f114afada0a7f3c937ac781 Change-Id: Ib17f5684574d31618f114afada0a7f3c937ac781
2024-04-30Merge "Merge cherrypicks of ['android-review.googlesource.com/3038266', ↵Android Build Coastguard Worker
'android-review.googlesource.com/3059342'] into sparse-11681991-L88500030003556042. SPARSE_CHANGE: I4685153939a5c136d915189cb675aaa59364fb5a SPARSE_CHANGE: I7479297f3d03a0f823fd714aad87cc3a55a787dc" into sparse-11681991-L88500030003556042
2024-04-30Merge cherrypicks of ['android-review.googlesource.com/3038266', ↵Android Build Coastguard Worker
'android-review.googlesource.com/3059342'] into sparse-11681991-L88500030003556042. SPARSE_CHANGE: I4685153939a5c136d915189cb675aaa59364fb5a SPARSE_CHANGE: I7479297f3d03a0f823fd714aad87cc3a55a787dc Change-Id: I3ce76e9c2168048f5876b4f51dfd54505427587a
2024-04-30Merge "Remove failing test on android 14 as the relevant code changes ↵Android Build Coastguard Worker
applied to android 15. (cherry picked from https://android-review.googlesource.com/q/commit:fcfa4a5d950e5d6551245899ebc7e139f32c30e0) Merged-In: I7479297f3d03a0f823fd714aad87cc3a55a787dc Change-Id: I7479297f3d03a0f823fd714aad87cc3a55a787dc" into snap-temp-L88500030003556042
2024-04-30Remove failing test on android 14 as the relevant code changes applied to ↵Kate Montgomery
android 15. (cherry picked from https://android-review.googlesource.com/q/commit:fcfa4a5d950e5d6551245899ebc7e139f32c30e0) Merged-In: I7479297f3d03a0f823fd714aad87cc3a55a787dc Change-Id: I7479297f3d03a0f823fd714aad87cc3a55a787dc
2024-04-30Merge "CTS: Fix media projection tests where "Entire screen" is not found" ↵Android Build Coastguard Worker
into snap-temp-L88500030003556042
2024-04-30CTS: Fix media projection tests where "Entire screen" is not foundChris Göllner
When running against older builds, the string might not be present yet. Bug: 333666432 Test: atest CtsMediaProjectionTestCases (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:161547f997445bd677af473f91235ce39ab340a4) NOTE FOR REVIEWERS - errors occurred while applying the patch. PLEASE REVIEW CAREFULLY. Errors: Error applying patch in tests/tests/media/projection/sdk33/src/android/media/projection/MediaProjectionSDK33Test.java: Cannot perform UNIFIED action on a non-existent file Original patch: From 161547f997445bd677af473f91235ce39ab340a4 Mon Sep 17 00:00:00 2001 From: Chris Göllner <chrisgollner@google.com> Date: Wed, 10 Apr 2024 16:15:47 +0100 Subject: [PATCH] CTS: Fix media projection tests where "Entire screen" is not found When running against older builds, the string might not be present yet. Bug: 333666432 Test: atest CtsMediaProjectionTestCases --- (cherry picked from https://android-review.googlesource.com/q/commit:7330dc2ec5af0a4bc4dd306575ab018526de4d91) Merged-In: I4685153939a5c136d915189cb675aaa59364fb5a Change-Id: I4685153939a5c136d915189cb675aaa59364fb5a
2024-04-30Merge "Merge empty history for sparse-11681991-L02500030003510195" into ↵Android Build Coastguard Worker
sparse_history
2024-04-30Merge empty history for sparse-11681991-L02500030003510195Android Build Coastguard Worker
Change-Id: Ia9fcaba0f31221e890f4978e632e17e7c4cb1e19
2024-04-30Merge "Merge cherrypicks of ['android-review.googlesource.com/3038266', ↵Android Build Coastguard Worker
'android-review.googlesource.com/3059342'] into sparse-11681991-L02500030003510195. SPARSE_CHANGE: I4685153939a5c136d915189cb675aaa59364fb5a SPARSE_CHANGE: I7479297f3d03a0f823fd714aad87cc3a55a787dc" into sparse-11681991-L02500030003510195
2024-04-30Merge cherrypicks of ['android-review.googlesource.com/3038266', ↵Android Build Coastguard Worker
'android-review.googlesource.com/3059342'] into sparse-11681991-L02500030003510195. SPARSE_CHANGE: I4685153939a5c136d915189cb675aaa59364fb5a SPARSE_CHANGE: I7479297f3d03a0f823fd714aad87cc3a55a787dc Change-Id: Ie0e3c051852e25f9136204dbfe1ac2d8caf97eea
2024-04-30Merge "Remove failing test on android 14 as the relevant code changes ↵Android Build Coastguard Worker
applied to android 15. (cherry picked from https://android-review.googlesource.com/q/commit:fcfa4a5d950e5d6551245899ebc7e139f32c30e0) Merged-In: I7479297f3d03a0f823fd714aad87cc3a55a787dc Change-Id: I7479297f3d03a0f823fd714aad87cc3a55a787dc" into snap-temp-L02500030003510195
2024-04-30Remove failing test on android 14 as the relevant code changes applied to ↵Kate Montgomery
android 15. (cherry picked from https://android-review.googlesource.com/q/commit:fcfa4a5d950e5d6551245899ebc7e139f32c30e0) Merged-In: I7479297f3d03a0f823fd714aad87cc3a55a787dc Change-Id: I7479297f3d03a0f823fd714aad87cc3a55a787dc
2024-04-30Merge "CTS: Fix media projection tests where "Entire screen" is not found" ↵Android Build Coastguard Worker
into snap-temp-L02500030003510195
2024-04-30CTS: Fix media projection tests where "Entire screen" is not foundChris Göllner
When running against older builds, the string might not be present yet. Bug: 333666432 Test: atest CtsMediaProjectionTestCases (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:161547f997445bd677af473f91235ce39ab340a4) NOTE FOR REVIEWERS - errors occurred while applying the patch. PLEASE REVIEW CAREFULLY. Errors: Error applying patch in tests/tests/media/projection/sdk33/src/android/media/projection/MediaProjectionSDK33Test.java: Cannot perform UNIFIED action on a non-existent file Original patch: From 161547f997445bd677af473f91235ce39ab340a4 Mon Sep 17 00:00:00 2001 From: Chris Göllner <chrisgollner@google.com> Date: Wed, 10 Apr 2024 16:15:47 +0100 Subject: [PATCH] CTS: Fix media projection tests where "Entire screen" is not found When running against older builds, the string might not be present yet. Bug: 333666432 Test: atest CtsMediaProjectionTestCases --- (cherry picked from https://android-review.googlesource.com/q/commit:7330dc2ec5af0a4bc4dd306575ab018526de4d91) Merged-In: I4685153939a5c136d915189cb675aaa59364fb5a Change-Id: I4685153939a5c136d915189cb675aaa59364fb5a
2024-04-07Merge "Snap for 11680196 from 05cb05c10f3fdb5916877f29d1345965d63c0c02 to ↵android-vts-14.0_r4Android Build Coastguard Worker
android14-tests-release" into android14-tests-release
2024-04-07Merge "Snap for 11680132 from 9a916858f30d017303c12876cd4ab1bab9dc47c5 to ↵android-vts-12.1_r10Android Build Coastguard Worker
android12L-tests-release" into android12L-tests-release
2024-04-07Snap for 11680196 from 05cb05c10f3fdb5916877f29d1345965d63c0c02 to ↵Android Build Coastguard Worker
android14-tests-release Change-Id: I5fb3c26779006db3481343724f9e08dbc104d053
2024-04-07Snap for 11680132 from 9a916858f30d017303c12876cd4ab1bab9dc47c5 to ↵Android Build Coastguard Worker
android12L-tests-release Change-Id: If546adf65baeaeaff88b0ffd0ec049a11ae556c3
2024-04-06Merge changes from topic "am-aa204855e0344ac0995287d4e7257528" into ↵Automerger Merge Worker
android14-tests-dev * changes: Merge changes from topic "am-efd471c296324df1a34aad9bc065d69d" into android13-tests-dev am: 9148fd5807 [automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to 11_R17" into android11-tests-dev am: bd75ba1250 -s ours am: 2a8fddeddb -s ours am: 3ca62c9975 -s ours am: cdbc7476df -s ours
2024-04-06Merge changes from topic "am-efd471c296324df1a34aad9bc065d69d" into ↵Automerger Merge Worker
android13-tests-dev am: 9148fd5807 Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: Ib164d697b20697b4cc81fcc762119076bfb000fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to ↵Treehugger Robot
11_R17" into android11-tests-dev am: bd75ba1250 -s ours am: 2a8fddeddb -s ours am: 3ca62c9975 -s ours am: cdbc7476df -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: Ic73c988b60fbad062af579a0747d32b1b2003a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06Merge changes from topic "am-efd471c296324df1a34aad9bc065d69d" into ↵Automerger Merge Worker
android13-tests-dev * changes: Merge changes from topic "am-68dbcbe8d6e748e395fc9a612abfd8f7" into android12L-tests-dev am: 9a916858f3 [automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to 11_R17" into android11-tests-dev am: bd75ba1250 -s ours am: 2a8fddeddb -s ours am: 3ca62c9975 -s ours
2024-04-06Merge changes from topic "am-68dbcbe8d6e748e395fc9a612abfd8f7" into ↵Automerger Merge Worker
android12L-tests-dev am: 9a916858f3 Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: I4c0fffe88a1f63275fc67306dccc3ea158ae1688 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to ↵Treehugger Robot
11_R17" into android11-tests-dev am: bd75ba1250 -s ours am: 2a8fddeddb -s ours am: 3ca62c9975 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: I84bc5dc509e004d24da891498bea97512ad7d3f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06Merge changes from topic "am-68dbcbe8d6e748e395fc9a612abfd8f7" into ↵Automerger Merge Worker
android12L-tests-dev * changes: Merge changes from topic "am-62bd645637a54d128b45b500723f0cf0" into android12-tests-dev am: 80618747c6 [automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to 11_R17" into android11-tests-dev am: bd75ba1250 -s ours am: 2a8fddeddb -s ours
2024-04-06Merge changes from topic "am-62bd645637a54d128b45b500723f0cf0" into ↵Automerger Merge Worker
android12-tests-dev am: 80618747c6 Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: I8d4b428d5286cb4c2aef76b5c28e2070bd9887f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to ↵Treehugger Robot
11_R17" into android11-tests-dev am: bd75ba1250 -s ours am: 2a8fddeddb -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: I6ffa48d83f88dab76817d493d89efd363de66a58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06Merge changes from topic "am-62bd645637a54d128b45b500723f0cf0" into ↵Automerger Merge Worker
android12-tests-dev * changes: [automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to 11_R17" into android11-tests-dev am: bd75ba1250 -s ours [automerger skipped] DO NOT MERGE: Bump CTS Verifier Version to 11_R17 am: 0b5046e87d -s ours
2024-04-06[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier Version to ↵Treehugger Robot
11_R17" into android11-tests-dev am: bd75ba1250 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: I9c495f56f0dfebef5bae6115764a3607972a4c82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06[automerger skipped] DO NOT MERGE: Bump CTS Verifier Version to 11_R17 am: ↵Anitha Gowdra
0b5046e87d -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/3029024 Change-Id: Ibc3d267aa9d1544c9cef5c0a55acf9c8849a2586 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-06Merge "DO NOT MERGE: Bump CTS Verifier Version to 11_R17" into ↵Treehugger Robot
android11-tests-dev
2024-04-05DO NOT MERGE: Bump CTS Verifier Version to 11_R17Anitha Gowdra
Bug:332960703 Change-Id: Id0520e9b6535cb12118187849ea78f654467eba6
2024-04-05Merge changes from topic "am-dd8a1ab627b340e1a56be81e12b03b18" into ↵Automerger Merge Worker
android14-tests-dev * changes: Merge changes from topic "am-f5cbfabf39484ac1ae9b90b202e442d1" into android13-tests-dev am: 97ffd2c4e1 -s ours [automerger skipped] Merge "Merge "Ensure Internet probing won't be skipped on VCN Tests" into android12-tests-dev am: e600432926" into android12L-tests-dev am: cfa482d9de -s ours am: bf5557f4b9 -s ours
2024-04-05Merge changes from topic "am-f5cbfabf39484ac1ae9b90b202e442d1" into ↵Automerger Merge Worker
android13-tests-dev am: 97ffd2c4e1 -s ours am skip reason: Merged-In I5c31086f5dd677ac32479582defa44e5ade7477e with SHA-1 edc7331850 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/3023136 Change-Id: I8acd9ac06e620a39fd205960f41a7b4666bbdf51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05[automerger skipped] Merge "Merge "Ensure Internet probing won't be skipped ↵Automerger Merge Worker
on VCN Tests" into android12-tests-dev am: e600432926" into android12L-tests-dev am: cfa482d9de -s ours am: bf5557f4b9 -s ours am skip reason: Merged-In I5c31086f5dd677ac32479582defa44e5ade7477e with SHA-1 edc7331850 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/3023136 Change-Id: I8e4cbe9e0623f4f4595e14499af8746b4d2808ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05Merge changes from topic "am-f5cbfabf39484ac1ae9b90b202e442d1" into ↵Automerger Merge Worker
android13-tests-dev * changes: [automerger skipped] Merge "Merge "Ensure Internet probing won't be skipped on VCN Tests" into android12-tests-dev am: e600432926" into android12L-tests-dev am: cfa482d9de -s ours [automerger skipped] Merge "Ensure Internet probing won't be skipped on VCN Tests" into android12-tests-dev am: e600432926 am: 540e76c31c -s ours
2024-04-05[automerger skipped] Merge "Merge "Ensure Internet probing won't be skipped ↵Automerger Merge Worker
on VCN Tests" into android12-tests-dev am: e600432926" into android12L-tests-dev am: cfa482d9de -s ours am skip reason: Merged-In I5c31086f5dd677ac32479582defa44e5ade7477e with SHA-1 edc7331850 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/3023136 Change-Id: I9fcd0f943b8a7247c49919f67f23d8f208f2198f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05[automerger skipped] Merge "Ensure Internet probing won't be skipped on VCN ↵Yan Yan
Tests" into android12-tests-dev am: e600432926 am: 540e76c31c -s ours am skip reason: Merged-In I5c31086f5dd677ac32479582defa44e5ade7477e with SHA-1 edc7331850 is already in history Original change: https://android-review.googlesource.com/c/platform/cts/+/3023136 Change-Id: Ie1e014cf972b8d9aa3bf14ac39eec0dd07b29512 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:44:41 +0000