commit 896a06f645955344ab7c496772f02168857fa3c2
author Jay Sullivan <jaysullivan@google.com> Sat Apr 02 18:02:56 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 02 18:02:56 2022 +0000
tree d5a2995309d1ff284f3559e95a3821d527722026
parent a9a0853ba3b002a99976739f8b5e0b2f3646e684
parent 36f0a835b58c8ac0efc634a67e421015684c8d2d

Merge "Wait for alert dialog" into tm-dev

tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt

diff --git a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
index c611d3890..fe5892e 100644
--- a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
@@ -105,6 +105,7 @@
         const val DENY_AND_DONT_ASK_AGAIN_BUTTON_TEXT =
                 "grant_dialog_button_deny_and_dont_ask_again"
         const val NO_UPGRADE_AND_DONT_ASK_AGAIN_BUTTON_TEXT = "grant_dialog_button_no_upgrade"
+        const val ALERT_DIALOG_MESSAGE = "android:id/message"
 
         const val REQUEST_LOCATION_MESSAGE = "permgrouprequest_location"
 
@@ -591,6 +592,8 @@
                 click(By.text(getPermissionControllerString(DENY_ANYWAY_BUTTON_TEXT)))
             } else if (!alreadyChecked && isLegacyApp && wasGranted) {
                 if (!isTv) {
+                    // Wait for alert dialog to popup, then scroll to the bottom of it
+                    waitFindObject(By.res(ALERT_DIALOG_MESSAGE))
                     scrollToBottom()
                 }