diff options
3 files changed, 1 insertions, 12 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java index de4fb9855bc4..23bae8881aa1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java @@ -37,7 +37,6 @@ import android.os.SystemClock; import android.platform.test.annotations.Presubmit; import android.util.SparseIntArray; -import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import com.android.server.wm.ActivityMetricsLaunchObserver.ActivityRecordProto; @@ -119,7 +118,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnIntentStarted() throws Exception { Intent intent = new Intent("action 1"); @@ -130,7 +128,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnIntentFailed() throws Exception { testOnIntentStarted(); @@ -146,7 +143,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnActivityLaunched() throws Exception { testOnIntentStarted(); @@ -158,7 +154,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnActivityLaunchFinished() throws Exception { testOnActivityLaunched(); @@ -173,7 +168,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnActivityLaunchCancelled() throws Exception { testOnActivityLaunched(); @@ -187,7 +181,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnActivityLaunchedTrampoline() throws Exception { testOnIntentStarted(); @@ -204,7 +197,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnActivityLaunchFinishedTrampoline() throws Exception { testOnActivityLaunchedTrampoline(); @@ -219,7 +211,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { } @Test - @FlakyTest(bugId = 129138370) public void testOnActivityLaunchCancelledTrampoline() throws Exception { testOnActivityLaunchedTrampoline(); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java index 7cfe71efdc46..c9263eb80592 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java @@ -32,7 +32,6 @@ import static org.junit.Assert.assertTrue; import android.platform.test.annotations.Presubmit; import android.view.InputChannel; -import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import org.junit.Before; @@ -88,7 +87,6 @@ public class TaskPositioningControllerTests extends WindowTestsBase { assertNull(mTarget.getDragWindowHandleLocked()); } - @FlakyTest(bugId = 129331490) @Test public void testHandleTapOutsideTask() { synchronized (mWm.mGlobalLock) { diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java index d8a01b9eb9b4..1eb716a63935 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java @@ -39,7 +39,6 @@ import android.platform.test.annotations.Presubmit; import android.support.test.uiautomator.UiDevice; import android.text.TextUtils; -import androidx.test.filters.FlakyTest; import androidx.test.filters.MediumTest; import com.android.internal.annotations.GuardedBy; @@ -159,6 +158,7 @@ public class TaskStackChangedListenerTest { * Tests for onTaskCreated, onTaskMovedToFront, onTaskRemoved and onTaskRemovalStarted. */ @Test + @Presubmit public void testTaskChangeCallBacks() throws Exception { final Object[] params = new Object[2]; final CountDownLatch taskCreatedLaunchLatch = new CountDownLatch(1); |