Merge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev (2112d11e) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import static com.android.server.wm.WindowContainer.POSITION_TOP;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;

		import android.support.test.filters.FlakyTest;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@@ -302,7 +301,6 @@ public class DisplayContentTests extends WindowTestsBase {
		}

		@Test
		@FlakyTest(bugId = 37908381)
		public void testFocusedWindowMultipleDisplays() throws Exception {
		// Create a focusable window and check that focus is calculated correctly
		final WindowState window1 =