From 4ff53666ad8279072a1edd65cd0e40b98ddce23e Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Mon, 19 Mar 2018 07:35:32 -0700 Subject: [PATCH] Removed flaky annotation from testFocusedWindowMultipleDisplays No longer flaky https://dashboards.corp.google.com/google::_550f6bcf_09dd_4963_b94c_d243e37d002f?f=class_name:in:com.android.server.wm.DisplayContentTests&f=test_name:in:com.android.server.wm.DisplayContentTests.testFocusedWindowMultipleDisplays&f=run_date_usec:eq:(null)&f=presubmit:in:false&f=build_id:eq:(null) Change-Id: I10504a24144e7636ab7205a079415f6d4eeba043 Fixes: 37908381 Test: self --- .../src/com/android/server/wm/DisplayContentTests.java | 2 -- 1 file changed, 2 deletions(-) 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 ccde049b99caa..4f49a4ae64671 100644 --- a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java @@ -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 =