commit debba252450ff139d58d48ff950c1a1be779e2e2
author Akshay Joshi <joshiakshay@google.com> Mon Feb 12 12:29:09 2018 -0800
committer Akshay Joshi <joshiakshay@google.com> Tue Feb 13 22:22:50 2018 +0000
tree 8d1e65bd6c611fe6d605964bd5daed881ebeccea
parent b5805e68b94a7f8204c5f979708f52cdedad38d9

Skip Magnification test if not on primary display

Magnification is supported on the primary display, skip this test if the
activity is launched on any other display.

Bug: 65733985
Test: AccessibilityGestureDispatchTest#testClickWhenMagnified_matchesActualTouch
Merged-In: Ib45ece15f042921dc2bd9200c2bc70907c57d824
Change-Id: I5c7b15bda30a5c36eefc4d4dd27765ea19bf6e06

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

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
index df8c6f3..aa30f77 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
@@ -34,6 +34,8 @@
 import android.os.SystemClock;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -52,6 +54,8 @@
  */
 public class AccessibilityGestureDispatchTest extends
         ActivityInstrumentationTestCase2<AccessibilityGestureDispatchTest.GestureDispatchActivity> {
+    private static final String TAG = AccessibilityGestureDispatchTest.class.getSimpleName();
+
     private static final int GESTURE_COMPLETION_TIMEOUT = 5000; // millis
     private static final int MOTION_EVENT_TIMEOUT = 1000; // millis
 
@@ -300,6 +304,12 @@
             return;
         }
 
+        int displayId = getActivity().getWindow().getDecorView().getDisplay().getDisplayId();
+        if (displayId != Display.DEFAULT_DISPLAY) {
+            Log.i(TAG, "Magnification is not supported on virtual displays.");
+            return;
+        }
+
         final WindowManager wm = (WindowManager) getInstrumentation().getContext().getSystemService(
                 Context.WINDOW_SERVICE);
         final StubMagnificationAccessibilityService magnificationService =