commit 8fc93f7c34f506615b41ef25351dc2a56fc0d623
author Anthony Hugh <ahugh@google.com> Wed Oct 26 13:16:27 2016 -0700
committer Anthony Hugh <ahugh@google.com> Wed Nov 02 20:20:50 2016 +0000
tree d37c62887a0c8d11dbb1c69bae571054c1049ce6
parent 670c270a760f5cd5f527ebc942d93ee3ff78574a

Fix second dialog CTS issues to be more generic

CTS test was trying to do a text comparison to find a UI element
using upper case letters, but some devices may use lower case letters.  
Fix is to use a case-insensitive matching instead.

BUG: 31779188
Change-Id: Ia2652af6ad0f30509145808ac538418cdb76a142

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 fd505bd..69fc9e9 100644
--- 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
@@ -312,6 +312,7 @@
                 waitForIdle();
 
                 if (wasGranted && legacyApp) {
+                    scrollToBottomIfWatch();
                     String packageName = getInstrumentation().getContext().getPackageManager()
                             .getPermissionControllerPackageName();
                     String resIdName = "com.android.packageinstaller"
@@ -321,7 +322,7 @@
                     final int confirmResId = resources.getIdentifier(resIdName, null, null);
                     String confirmTitle = resources.getString(confirmResId);
                     UiObject denyAnyway = getUiDevice().findObject(new UiSelector()
-                            .text(confirmTitle.toUpperCase()));
+                            .textStartsWith(confirmTitle));
                     denyAnyway.click();
 
                     waitForIdle();