Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev (e8b15263) · Commits · e / os / android_frameworks_base

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

+2 −2

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

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

	@@ -300,7 +300,7 @@ public class DisplayContentTests extends WindowTestsBase {
	}		}

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