commit c3466412c6a7b401270b870e0b30c13a0e61d00a
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 10 22:51:33 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 10 22:51:33 2019 +0000
tree 8168e92d2180708331ad5c5389a27c269b06096b
parent 52a05e2e386a75572a5514e57a1c33ad889af6c3
parent 1fd681c0d0830609e948ac0b9518f31ccc3c1537

Merge "DO NOT MERGE Wait WINDOWS_CHANGED event when a popup is shown" into pie-cts-dev

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 d6b39fd..68ec7cc 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
@@ -394,15 +394,17 @@
             if (granted != wasGranted) {
                 // Toggle the permission
 
+                boolean willShowPopup = (wasGranted && legacyApp);
+
                 if (!itemView.getActionList().contains(AccessibilityAction.ACTION_CLICK)) {
-                    click(toggleView, false);
+                    click(toggleView, willShowPopup);
                 } else {
-                    click(itemView, false);
+                    click(itemView, willShowPopup);
                 }
 
                 waitForIdle();
 
-                if (wasGranted && legacyApp) {
+                if (willShowPopup) {
                     scrollToBottomIfWatch();
                     String packageName = getInstrumentation().getContext().getPackageManager()
                             .getPermissionControllerPackageName();