summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-27 19:11:26 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-27 19:11:26 +0000
commitc0cb9c0ad5c252e14620a6dab6efc402f769ce20 (patch)
tree9c695f354ee86b9140f03307a719e1a5e5e0c6fe
parentfbb045e81f49b633178144c8f2901efe86e944f6 (diff)
parent4381c33562da4ab17de28ae5df93f3c76363743a (diff)
downloadcts-frc_340821000.tar.gz
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24201131'] into sparse-10564971-L59400000962254625.frc_340821000frc_340818170frc_340818110
SPARSE_CHANGE: Ic3e2868671b4cc4bf263e81bf9fa5d3e25f4fe79 Change-Id: I0dab310fbe7881f2985571df8932ddaad4815f2a
-rw-r--r--tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt b/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt
index eaa34f90ea6..837e1a2b0c4 100644
--- a/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt
@@ -74,7 +74,7 @@ class LocationProviderInterceptDialogTest : BaseUsePermissionTest() {
By.textContains("Location access can be modified from location settings"),
true)
click(By.res(LOCATION_ACCESS_BUTTON_RES))
- findView(By.textContains("Use location"), true)
+ findView(By.res(USE_LOCATION_LABEL_ID), true)
}
@Test
@@ -121,6 +121,8 @@ class LocationProviderInterceptDialogTest : BaseUsePermissionTest() {
}
companion object {
+ private const val USE_LOCATION_LABEL_ID =
+ "com.android.settings:id/switch_text"
private const val MIC_LOCATION_PROVIDER_APP_APK_PATH =
"$APK_DIRECTORY/CtsAccessMicrophoneAppLocationProvider.apk"
private const val MIC_LOCATION_PROVIDER_APP_PACKAGE_NAME =