commit bfa9d264754f00a23f91b636ce88bd1b796e62fe
author Tina Zhou <tinazh@google.com> Fri Jan 27 00:26:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 27 00:26:03 2017 +0000
tree 090ae354ea587f4d5ee9ec07556cb9a0cb2ce3ca
parent 5215a54774db8c0e2c4324b908db9702d43fd714
parent 54b6dc17a574162c1b2e3240d094228e84c02674

Merge "Disable CTS test that needs multiWindow if not supported" into nougat-mr1-cts-dev

tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index adc3c98..4a00f77 100755
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -27,6 +27,7 @@
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.UiAutomation;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.Rect;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.Gravity;
@@ -574,6 +575,13 @@
             // Android TV doesn't support the divider window
             return;
         }
+        // Get com.android.internal.R.bool.config_supportsMultiWindow
+        if (!getInstrumentation().getContext().getResources().getBoolean(
+                Resources.getSystem().getIdentifier("config_supportsMultiWindow", "bool",
+                        "android"))) {
+            // Check if multiWindow is supported.
+            return;
+        }
         setAccessInteractiveWindowsFlag();
         final UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
         assertFalse(isDividerWindowPresent(uiAutomation));