diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-10 21:32:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-10 21:32:51 +0000 |
| commit | 15884e571698defdad13e2e921e3c05aae39e8f4 (patch) | |
| tree | 87596ffbc5b8462f1ee10b5f0a1b322ee7e0dd1f | |
| parent | 5321f1ce5bf66512b1973112d55a011db18e69c7 (diff) | |
| parent | 4a8d8747786b23107a043cee0b1f8bd32215d949 (diff) | |
| download | cts-temp-sc-sam.tar.gz | |
Merge "Use text to find toggle buttons on automotive" am: 4a8d874778temp-sc-sam
Original change: https://android-review.googlesource.com/c/platform/cts/+/1918739
Change-Id: I84cec73e10ea004a55e884f58312908c9a3df72f
| -rw-r--r-- | tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt index 37856553b79..6b3557d7e04 100644 --- a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt +++ b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt @@ -473,14 +473,8 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { // Automotive doesn't support one time permissions, and thus // won't show an "Ask every time" message when (state) { - PermissionState.ALLOWED -> - if (showsForegroundOnlyButton(permission)) { - By.text(getPermissionControllerString( - "app_permission_button_allow_foreground")) - } else { - By.text(getPermissionControllerString( - "app_permission_button_allow")) - } + PermissionState.ALLOWED ->By.text( + getPermissionControllerString("app_permission_button_allow")) PermissionState.DENIED -> By.text( getPermissionControllerString("app_permission_button_deny")) PermissionState.DENIED_WITH_PREJUDICE -> By.text( |