commit ce4e4560cf6e11bcbec337ddefa9b55173ddf025
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 25 16:16:08 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 25 16:16:08 2018 +0000
tree e3d1f9eceae0244f19e31f1f4d6fba54d155ed2d
parent 14379e126c352eb49fe8eb4cd1a268bc7f522169
parent ef859dacb07c80dbeac15139e9e7a6d10a59828f

Merge "Scrolls preferences into view where needed so tests pass."

hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java

diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
index 3d1fa10..36148cb 100755
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
@@ -476,7 +476,9 @@
                     return result;
                 }
                 try {
-                    while (child.getActionList().contains(AccessibilityAction.ACTION_SCROLL_FORWARD)) {
+                    while (child.getActionList().contains(
+                            AccessibilityAction.ACTION_SCROLL_FORWARD) || child.getActionList()
+                            .contains(AccessibilityAction.ACTION_SCROLL_DOWN)) {
                         scrollForward(child);
                         result = getNodeTimed(() -> findByText(child, text), false);
                         if (result != null) {