commit 5f0e436548ea3bd10cef480c194da7da6080ac1e
author Wale Ogunwale <ogunwale@google.com> Tue May 02 20:23:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 02 20:23:49 2017 +0000
tree 59ee9d43883e36c4cc26454cdbc8d71b99db75d3
parent 3cb61255abad0d9426e80261f0c38b02937f33fb
parent 42bab7897f16c884d5c40ccc8a09f3e9f3338a65

Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev

services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java

diff --git a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
index e8dc69f..f9254ad 100644
--- a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
+++ b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
@@ -26,6 +26,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -236,6 +237,7 @@
     }
 
     @Test
+    @Ignore
     public void testFocusedWindowMultipleDisplays() throws Exception {
         // Create a focusable window and check that focus is calcualted correctly
         final WindowState window1 =