Merge "[Permissions][CTS] Fix Some CtsPermissionUiTestCases Failures" into main

5 files changed, 13 insertions, 8 deletions

diff --git a/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt
index accadf807..227fb7fe5 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt
@@ -386,7 +386,8 @@ abstract class BaseUsePermissionTest : BasePermissionTest() {
     protected fun clickPermissionReviewContinue() {
         if (isAutomotive || isWatch) {
             clickAndWaitForWindowTransition(
-                By.text(getPermissionControllerString("review_button_continue")))
+                By.text(getPermissionControllerString("review_button_continue")), TIMEOUT_MILLIS * 2
+            )
         } else {
             clickAndWaitForWindowTransition(
                 By.res("com.android.permissioncontroller:id/continue_button"))
@@ -708,7 +709,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() {
     }
 
     protected fun findPermissionRequestAllowButton(timeoutMillis: Long = 20000) {
-        if (isAutomotive) {
+        if (isAutomotive || isWatch) {
             waitFindObject(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)), timeoutMillis)
         } else {
             waitFindObject(By.res(ALLOW_BUTTON), timeoutMillis)
@@ -716,7 +717,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() {
     }
 
     protected fun clickPermissionRequestAllowButton(timeoutMillis: Long = 20000) {
-        if (isAutomotive) {
+        if (isAutomotive || isWatch) {
             click(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)), timeoutMillis)
         } else {
             click(By.res(ALLOW_BUTTON), timeoutMillis)
@@ -775,7 +776,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() {
     }
 
     protected fun findPermissionRequestAllowForegroundButton(timeoutMillis: Long = 20000) {
-        if (isAutomotive) {
+        if (isAutomotive || isWatch) {
             waitFindObject(By.text(
                 getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)), timeoutMillis)
         } else {
@@ -784,7 +785,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() {
     }
 
     protected fun clickPermissionRequestAllowForegroundButton(timeoutMillis: Long = 10_000) {
-        if (isAutomotive) {
+        if (isAutomotive || isWatch) {
             click(By.text(
                 getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)), timeoutMillis)
         } else {
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt
index d517571ce..ceb1d170d 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt
@@ -40,7 +40,8 @@ class MediaPermissionUpgradeTest : BaseUsePermissionTest() {
 
         // Request STORAGE, and click allow
         requestAppPermissionsAndAssertResult(
-            READ_EXTERNAL_STORAGE to true
+            READ_EXTERNAL_STORAGE to true,
+            waitForWindowTransition = !isWatch
         ) {
             clickPermissionRequestAllowButton()
         }
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt
index 8240741f7..4e62a62ad 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt
@@ -194,7 +194,7 @@ class NotificationPermissionTest : BaseUsePermissionTest() {
     fun notificationPromptShownForSubsequentStartsIfTaskStartWasLauncher() {
         installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
         launchApp(startSecondActivity = true)
-        if (isAutomotive) {
+        if (isAutomotive || isWatch) {
             waitFindObject(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)))
         } else {
             waitFindObject(By.res(ALLOW_BUTTON))
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt
index c8df49cb7..298c35cca 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt
@@ -80,6 +80,7 @@ class PermissionGroupTest : BaseUsePermissionTest() {
         // but two from this group are <uses-permission> in the manifest
         requestAppPermissionsAndAssertResult(
             android.Manifest.permission.RECEIVE_SMS to true,
+            waitForWindowTransition = !isWatch
         ) {
             clickPermissionRequestAllowButton()
         }
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt
index a72e15f10..cd771f8a2 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt
@@ -73,7 +73,9 @@ class PermissionReviewTapjackingTest : BaseUsePermissionTest() {
         )
 
         if (isWatch) {
-            waitFindObject(By.text(getPermissionControllerString("review_button_cancel")))
+            waitFindObject(
+                By.text(getPermissionControllerString("review_button_cancel")), TIMEOUT_MILLIS * 2
+            )
         } else {
             waitFindObject(By.res("com.android.permissioncontroller:id/permissions_message"))
         }