Merge "DO NOT MERGE: Stronger scroll search in BaseUsePermissionTest" into android14-tests-dev

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
index 4d8c9b1bb19..e9ff0401605 100644
--- a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
@@ -49,6 +49,7 @@ import com.android.compatibility.common.util.SystemUtil
 import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity
 import com.android.compatibility.common.util.SystemUtil.eventually
 import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import com.android.compatibility.common.util.UiAutomatorUtils2
 import com.android.modules.utils.build.SdkLevel
 import java.util.concurrent.TimeUnit
 import java.util.regex.Pattern
@@ -1122,6 +1123,14 @@ abstract class BaseUsePermissionTest : BasePermissionTest() {
                 // (b/246984354).
                 e.printStackTrace()
             }
+            try {
+                // Try using UiAutomatorUtils2 to further strengthen the scrolling search.
+                // We are keeping the "scrollTextIntoView" method above out of abundance of caution
+                // to avoid breaking tests that used to pass.
+                UiAutomatorUtils2.waitFindObjectOrNull(By.text(viewText))
+            } catch (e: UiObjectNotFoundException) {
+                e.printStackTrace()
+            }
         }
     }