summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-20Merge cherrypicks of ['googleplex-android-review.googlesource.com/25658451'] ↵aml_ext_341414010android14-mainline-extservices-releaseAndroid Build Coastguard Worker
into mainline-extservices-release. Change-Id: I9ebe2e58b6a5c1841cfd6cd63486fefab530b086
2023-12-20Remove failing TextClassiferTest suiteRobert Marcus
Attempts to ignore a single failing test and even remove the failing test have just resulted in other failures popping up. For now, remove the test suite entirely. Bug: 315110905 Test: presubmits (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4adacf4aade9ae982af355aaa23275c385d8f9c0) Merged-In: I84d3cb8bbb233c254cd28bc0283b30a882de85a7 Change-Id: I84d3cb8bbb233c254cd28bc0283b30a882de85a7
2023-12-12Merge cherrypicks of ['googleplex-android-review.googlesource.com/25631710'] ↵Android Build Coastguard Worker
into mainline-extservices-release. Change-Id: Ia9cad3b5156cb05e754d9caad3f80e3bb77b8211
2023-12-12Disable broken TextClassiferTest caseRobert Marcus
Bug: 315110905 Test: atest CtsTextClassifierTestCases (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d586ad36ff1e1b0a2ff2f30ee31760ad2ba6ee9f) Merged-In: Ied189b5df1222f75dd5fd5bbbc7e92a65fa1cefe Change-Id: Ied189b5df1222f75dd5fd5bbbc7e92a65fa1cefe
2023-12-04Snap for 11174750 from 12818886299cfceba9cc5f1a975790527b46d705 to ↵Android Build Coastguard Worker
mainline-extservices-release Change-Id: Ia3b40c7b90f0eb860f61391f01cbf8ef3c2a2b0e
2023-12-04[automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in ↵Tiger Huang
WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 am: 238dc5e9c9 am: 8bd6bedb5c am: 92b53a95ea -s ours am: dae617277b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I48f4aa38d2b07c46221ad2198087857cbafadd41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] DO NOT MERGE: Fix the number of clicks in ↵AOYAGI Takako
WindowInsetsBehaviorTests am: a049761f36 am: 33fc6eb2ee am: 8d7eb9dd4d am: aef2d4a57a -s ours am: f0e470ec74 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I119477b89f427b2202cd89ee9776dbfd59c419e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in ↵Tiger Huang
WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 am: 238dc5e9c9 am: c07dbba3cc -s ours am: db1650b608 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I6b38a5dd694ec9d4bede6e870f5a966954e1867f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] DO NOT MERGE: Fix the number of clicks in ↵AOYAGI Takako
WindowInsetsBehaviorTests am: a049761f36 am: 33fc6eb2ee am: 09811188df -s ours am: e4d0b717e3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I0bbf7faa2041faa164f4efc2b61f0343f3268243 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in ↵Tiger Huang
WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 am: 238dc5e9c9 am: 8bd6bedb5c am: 92b53a95ea -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I0494eece8a4b3209fcc253b376ad39838ce4321a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] DO NOT MERGE: Fix the number of clicks in ↵AOYAGI Takako
WindowInsetsBehaviorTests am: a049761f36 am: 33fc6eb2ee am: 8d7eb9dd4d am: aef2d4a57a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: Ia6797d426ff65d77d36a069d970211d47b18ccf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in ↵Tiger Huang
WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 am: 238dc5e9c9 am: c07dbba3cc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I544d94fafb3577dc8134d6bd4f747b86ada308ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] DO NOT MERGE: Fix the number of clicks in ↵AOYAGI Takako
WindowInsetsBehaviorTests am: a049761f36 am: 33fc6eb2ee am: 09811188df -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: Ifaefa574dd235c9a5084e96824f7169a91b2e8af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests" ↵Tiger Huang
into android13-tests-dev am: 481e76a1f6 am: 238dc5e9c9 am: 8bd6bedb5c Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I197597292541db80286a07fecee0758e9927b8d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests am: ↵AOYAGI Takako
a049761f36 am: 33fc6eb2ee am: 8d7eb9dd4d Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I9a0618b28a64bc95748dbfc3fe7d6529fef4b3fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests" ↵Tiger Huang
into android13-tests-dev am: 481e76a1f6 am: 238dc5e9c9 Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I99b02d8365904af37e1b873db3d90466c2a473f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge changes from topic "am-74df63c5d4474fb59faab6f130df1153" into ↵Automerger Merge Worker
android14-tests-dev am: 169c2fabff am: bf694c30d7 Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I839b4951353946168fedb532b302c5b729f3437d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests am: ↵AOYAGI Takako
a049761f36 am: 33fc6eb2ee Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I11bb66c2a68daa92ba8bdd4b113eaa3d22928312 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in ↵Tiger Huang
WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 -s ours am: 5deafc2085 -s ours am: ab6037f728 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: Iea8220edd601d67c5ce19ecc3d0a433b284f2a96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests" ↵Tiger Huang
into android13-tests-dev am: 481e76a1f6 am: 238dc5e9c9 Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I517a40edd31e3316d7eec3b3a2ebb2e31df599ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests am: ↵AOYAGI Takako
a049761f36 am: 33fc6eb2ee Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I86f734ce6e6e5f94ac9530a95e15574c9a5ba199 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge changes from topic "am-74df63c5d4474fb59faab6f130df1153" into ↵Automerger Merge Worker
android14-tests-dev am: 169c2fabff Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I53a06cdfecf261e44e17954dd71227a70ace0a02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in ↵Tiger Huang
WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 -s ours am: 5deafc2085 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: Ie4a71ed26da184874700fcae403bf39d76e58a78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests" ↵Tiger Huang
into android13-tests-dev am: 481e76a1f6 Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I45ca7a4ef246d68538dc5c5d7698040597176c72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests am: ↵AOYAGI Takako
a049761f36 Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I123a7b0a381e69f14fede160c9aa094c00965d5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge changes from topic "am-74df63c5d4474fb59faab6f130df1153" into ↵Automerger Merge Worker
android14-tests-dev * changes: [automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 -s ours [automerger skipped] DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests am: a049761f36 -s ours
2023-12-04[automerger skipped] Merge "DO NOT MERGE: Fix the number of clicks in ↵Tiger Huang
WindowInsetsBehaviorTests" into android13-tests-dev am: 481e76a1f6 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: I973455b67db02116cec7109b49b656194dcbab18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] DO NOT MERGE: Fix the number of clicks in ↵AOYAGI Takako
WindowInsetsBehaviorTests am: a049761f36 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/2845558 Change-Id: Iaf11b07e23d4e0d0382e9c7b247d057a8f185af5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTests" ↵Tiger Huang
into android13-tests-dev
2023-12-04DO NOT MERGE: Fix the number of clicks in WindowInsetsBehaviorTestsAOYAGI Takako
Before this CL, the number of clicks depended on the display size. The test clicked more on larger displays, and took more time to complete. However, the test would time out after 5 minutes. If the test runs on a large enough display, it would time out. This CL fixes the number of clicks. So the test time won't be affected by the display size. Bug: 276401160 Bug: 311303545 Test: Run WindowInsetsBehaviorTests on a large-display device. Change-Id: I92494208cae52c8e075e6c1b1e852bfa3cda447a Signed-off-by: AOYAGI Takako <aoyagi.takako@jp.panasonic.com>
2023-12-04Merge "Fix the test failure due to we allow set SSI in SDEA" into ↵Treehugger Robot
android14-tests-dev am: e1db0e5b7a am: 7e7eb80e3a Original change: https://android-review.googlesource.com/c/platform/cts/+/2855228 Change-Id: I91ff89208924ef22b906c922ea61a642069acfe1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "Fix the test failure due to we allow set SSI in SDEA" into ↵Treehugger Robot
android14-tests-dev am: e1db0e5b7a Original change: https://android-review.googlesource.com/c/platform/cts/+/2855228 Change-Id: I7ea530f861590312099d5eeb76acd8c51548f15f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge "Fix the test failure due to we allow set SSI in SDEA" into ↵Treehugger Robot
android14-tests-dev
2023-12-01Merge "Reland "Change expected result code on install failure with ↵Treehugger Robot
secureFRP"" into android14-tests-dev am: 19d1c97434 am: 9f93821727 Original change: https://android-review.googlesource.com/c/platform/cts/+/2847802 Change-Id: If622fa1e7453cfdc8ba59c6ab70f8b6338f29f7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Reland "Change expected result code on install failure with ↵Treehugger Robot
secureFRP"" into android14-tests-dev am: 19d1c97434 Original change: https://android-review.googlesource.com/c/platform/cts/+/2847802 Change-Id: I37109c53d890fbcc7586f161b4095b7db6dac63b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Reland "Change expected result code on install failure with ↵Treehugger Robot
secureFRP"" into android14-tests-dev
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android14-tests-dev am: 09d76a2b0f am: f724b31be2 Original change: https://android-review.googlesource.com/c/platform/cts/+/2855011 Change-Id: I19046aa180b52cf32154974790ae653e583aea65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android13-tests-dev am: 56895bfdbf am: 0e3b7ab413 am: 9bd073f9e6 am: 536ab36b7c am: 72bf0a3469 Original change: https://android-review.googlesource.com/c/platform/cts/+/2855012 Change-Id: Ic831561558b6229ced34fc70b320e7941ed65191 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01[automerger skipped] [conflict] Merge "CTS test for Android Security ↵Treehugger Robot
b/179042963" into rvc-dev am: 2247a7bc61 am: c6da1b52c5 am: 8dc430ae53 am: 32562e392f -s ours am: adcd949818 -s ours am: eb3117780a -s ours am: 70f66e3c31 -s ours am: c437e5d8e0 -s ours am: f054b2fd62 -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 74e521dbdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25506414 Change-Id: Ibba9e3d97f3510e8b55e85a5320c3b9c1009b87f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android14-tests-dev am: 09d76a2b0f Original change: https://android-review.googlesource.com/c/platform/cts/+/2855011 Change-Id: I1ae5d18fc0b73b4b45ec89e74e191f7a1e5f36a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android13-tests-dev am: 56895bfdbf am: 0e3b7ab413 am: 9bd073f9e6 am: 536ab36b7c Original change: https://android-review.googlesource.com/c/platform/cts/+/2855012 Change-Id: Ifdd00b03d7a54b845be1cfc086802ccf47b1feff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01[automerger skipped] [conflict] Merge "CTS test for Android Security ↵Treehugger Robot
b/179042963" into rvc-dev am: 2247a7bc61 am: c6da1b52c5 am: 8dc430ae53 am: 32562e392f -s ours am: adcd949818 -s ours am: eb3117780a -s ours am: 70f66e3c31 -s ours am: c437e5d8e0 -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 74e521dbdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25506414 Change-Id: If9575fca08e96dd36713fe19cff4e3eb34e0ebf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android14-tests-dev
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android13-tests-dev am: 56895bfdbf am: 0e3b7ab413 am: af81f7588c am: 235d4dd1b0 Original change: https://android-review.googlesource.com/c/platform/cts/+/2855012 Change-Id: If50720c39c0e5ed69d89642a920674016f674f3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01[automerger skipped] [conflict] Merge "CTS test for Android Security ↵Treehugger Robot
b/179042963" into rvc-dev am: 2247a7bc61 am: c6da1b52c5 am: 8dc430ae53 am: 32562e392f -s ours am: adcd949818 -s ours am: eb3117780a -s ours am: e824eb7b0e -s ours am: d32a8d5c3b -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 74e521dbdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25506414 Change-Id: Ib61e87163ca9ba85f9e92f2993678f1a6db9afda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Merge "Use product API level, not board API level for tunnel mode ↵Automerger Merge Worker
behavior tests." into android13-tests-dev am: 56895bfdbf" into android14-tests-dev am: ea902ab8d4 am: 4a89562fe2 Original change: https://android-review.googlesource.com/c/platform/cts/+/2855012 Change-Id: Ie8f6fead90bdaf75ffab1a4b6374407436367ae5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android13-tests-dev am: 56895bfdbf am: 0e3b7ab413 am: af81f7588c Original change: https://android-review.googlesource.com/c/platform/cts/+/2855012 Change-Id: I53986387c3786552bf74ef055dace8e13eb0e6fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01[automerger skipped] [conflict] Merge "CTS test for Android Security ↵Treehugger Robot
b/179042963" into rvc-dev am: 2247a7bc61 am: c6da1b52c5 am: 8dc430ae53 am: 32562e392f -s ours am: adcd949818 -s ours am: eb3117780a -s ours am: e824eb7b0e -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 74e521dbdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25506414 Change-Id: Iff561a5f9915cc932c749de1391fbfb02561cdf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge "Use product API level, not board API level for tunnel mode behavior ↵Brian Lindahl
tests." into android13-tests-dev am: 56895bfdbf am: 0e3b7ab413 am: 9bd073f9e6 Original change: https://android-review.googlesource.com/c/platform/cts/+/2855012 Change-Id: I9e158f950e38407008009ce2a93eb014631551d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01[automerger skipped] [conflict] Merge "CTS test for Android Security ↵Treehugger Robot
b/179042963" into rvc-dev am: 2247a7bc61 am: c6da1b52c5 am: 8dc430ae53 am: 32562e392f -s ours am: adcd949818 -s ours am: eb3117780a -s ours am: 70f66e3c31 -s ours am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 74e521dbdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25506414 Change-Id: I4d3f6a5d91c800dc08733de60666c015020ad449 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-10 02:21:04 +0000