summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-24Merge "Switch test refresh timeout to full test timeout" into ↵android14-tests-devTreehugger Robot
android14-tests-dev
2023-10-24Merge changes from topic ↵Treehugger Robot
"cherrypicker-L61600000963649159:N20600001415965012" into android14-tests-dev * changes: Allow timeout to be even larger than 1 minute. Bump timeout when ran in post-submit.
2023-10-23Remove some assertions from a test.Elliot Sisteron
This test is too slow for presubmit otherwise, and these assertions are already covered in other tests. Bug: 288381777 Test: atest SafetyCenterActivityTest Relnote: N/A (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16f35b312a5d545fee5738ab65c9598fed66a7bd) Merged-In: I9d7dc455a67a76144fe08df60f37a44ac5b6e060 Change-Id: I9d7dc455a67a76144fe08df60f37a44ac5b6e060
2023-10-23Switch test refresh timeout to full test timeoutSimon Wingrove
Cherry-picks remaining test change from I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 which increases timeouts of refresh to allow UI tests to not be broken by refresh timeouts not being tested for. Test: atest SafetyCenterActivityFunctionalTestCases Bug: 306518190 Merged-In: I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 Change-Id: I64445a908d9d844789a84007523f9ed357bb6e18
2023-10-23Allow timeout to be even larger than 1 minute.Elliot Sisteron
See b/276844473#comment8 Bug: 276844473 Test: atest SafetyCenterFuctionalMultiUsersTestCases Relnote: N/A (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a72037fb03778f25356fa19b4fe117335e8d9c65) Merged-In: If16b2e93f9158767e7d6fb8a82d30a87a12e6595 Change-Id: If16b2e93f9158767e7d6fb8a82d30a87a12e6595
2023-10-23Bump timeout when ran in post-submit.Elliot Sisteron
See b/276844473#comment4. Bug: 276844473 Test: run Safety Center tests Relnote: N/A (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:afda0fa23abea2577265c34f1b8fcdd6c264d181) Merged-In: Id5b716a3e44167f7c1ffe958174e516445f6ccad Change-Id: Id5b716a3e44167f7c1ffe958174e516445f6ccad
2023-10-19Apply test changes related to flag cleanup.Simon Wingrove
Changes related to cleanup of safety_center_show_error_entries_on_timeout, update CTS test to prevent breakage. Take 2 without accidental change to imports of hostside tests. CP of I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 with only test changes. Bug: 289788052 Test: SafetyCenter tests Relnote: N/A Merged-In: I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 Change-Id: I89408fa1c5744f40ed88195afa4fde7dd5c12d2e
2023-10-19Revert "Apply test changes related to flag cleanup."Sebastian Pickl
This reverts commit 382a6a332d544e3c7fcdfceda7314de5ce5aef86. Reason for revert: this change seems to be breaking builds b/306320276 Bug: 306320276 Change-Id: I1a3690789be7e9088d4c021d64678279711c1fad
2023-10-17Apply test changes related to flag cleanup.Simon Wingrove
Changes related to cleanup of safety_center_show_error_entries_on_timeout, update CTS test to prevent breakage. CP of I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 with only test changes. Bug: 289788052 Test: SafetyCenter tests Relnote: N/A Merged-In: I1f9dc8749d46f437c8dfbb98228ed1f042ee5821 Change-Id: Ie087ee4e3c3e6944bd6764e19f68ea390bda079b
2023-10-17Needed in support of b/301215854Elliot Sisteron
Add support for predicate matches in test listener. Needed for quiet mode tests. Can also be used to write more resilient tests / avoiding using Thread.sleep. Bug: 272493869 Test: to follow Relnote: N/A (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5e5ce76eb31a96111e0fd01bcc824ad6c81cb1df) Merged-In: I8c3d3eb44f28ca7f21bbd1841733894ad9a29d64 Change-Id: I8c3d3eb44f28ca7f21bbd1841733894ad9a29d64
2023-06-21Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devandroid14-devTreeHugger Robot
2023-06-20Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib02bfa3e9e6316de30df9bd9e12e16b498915cb8
2023-06-20Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I22edbc6bddd40c0ee5a48b2932bd95c50660b534
2023-06-14[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
tm-mainline-prod am: 1972f909c2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23668744 Change-Id: Ie9d34e5da053732d10d5f5ff9bedfa4209fac491 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
db29a73f73 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23668744 Change-Id: I9f025e3f40daf3b827e8dfb8a0a7bbfb0492ce84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreehugger Robot
2023-06-14Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devTreehugger Robot
2023-06-14Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devTreehugger Robot
2023-06-14Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devTreehugger Robot
2023-06-13[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e138ba3875 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23668745 Change-Id: I2ae54675277745850f1a99884714f3bd9a4f1e89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6372d248e3cda33a464b5bbfaefd55ca9246cd05
2023-06-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id9ad6ef1e38b8c9eebddb9ccf594a616551328e1
2023-06-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1cb5dd1f92742fe30c6f35cef799c7b78348e5d5
2023-06-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia581e6c000e6c4672f1a8bed77195d54f8b017cf
2023-06-12Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I92b2a9d484402c4e9dd948212ee9816aaad95464
2023-06-06Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devBill Yi
2023-06-06Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devBill Yi
2023-06-06Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devBill Yi
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-mainline-prod am: d7e74dd13f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23556269 Change-Id: I86ab6376e3f0bf161003c1b71716b8a0c9baf36c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f48ec22c6e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23556269 Change-Id: I0be883c4f1a587ec66e78931209ae052c06af28b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-mainline-prod am: cdf7405c33 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23556270 Change-Id: I12412e1031f046ca2cdf18a2ddb5b44b7abb0f57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
18b89a2e2f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23556270 Change-Id: Ieb4a13815f7bca2e97d7ed45dfdc88bbc6f12d49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
tm-qpr-dev am: 749075f0bb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23556272 Change-Id: If29ab3f4795b84c2319d3986b02fe0ae4573acaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c67d56a354 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23556272 Change-Id: Ided17a20efe198b746e5c05caa2df9eb88c1efb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
126b2f18e0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23556271 Change-Id: I10e7b2308c47d5120d197f1ef203d76e13b084fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
90ed1db955 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23558039 Change-Id: Ie173786c0c6249a8ac1bb94bedae0aa7535dbb02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devTreehugger Robot
2023-06-05Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-06-05Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iaae0386003eaeb3e1b1cdfe43f35a9abbdf11682
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4cdd837d0db23c838aa09e65bcc1db5a8830a92f
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idea8a45d634be11eeff1aef439d280ef6b815634
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I119e66513beb3ce9453e0614880dff0e1f7245c6
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iad2e156d457ab3a4d9943d7ac21940c16aa0da7a
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0fecdfb7406a84c50ed4e4b55cb862af59d3938e
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5d44f166573550df4f638da85b400693ec97cac6
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib9a77b2573421f5867f0ee53c056dfd915881b55
2023-06-02Merge "Remove unused string and overlay" into udc-devRichard MacGregor
2023-06-01Remove unused string and overlayRichard MacGregor
Reduce OEM work by removing string overlay and accompanying test Bug: 285196496 Test: atest PermissionControllerResourceTest Change-Id: I6e7335c633008a428210fe778341282dd12c2d03
2023-05-31Add POST_NOTIFICATIONS permission to DLC and kiosk app roles.Amos Bianchi
Bug: 285213134 Test: permission granted adb shell dumpsys package com.google.android.devicelockcontroller shows that the permission is granted to DLC. adb shell dumpsys package com.google.android.apps.sample.kioskvnext shows that the permission is granted to the kiosk app. Change-Id: I6590c1187e0d73d8ed7f9022466ce9eb780c86aa
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 09:08:39 +0000