diff options
| author | 2019-12-18 17:12:30 +0000 | |
|---|---|---|
| committer | 2019-12-18 17:12:30 +0000 | |
| commit | c40091bf4d5116c6bb8f0446e93b83bc4b2a65b8 (patch) | |
| tree | e7ba39cc501bb2cde1b2caf63806c0252d26ab27 | |
| parent | 93309c0242f8885be548f5c242ce581a0a54dfe0 (diff) | |
| parent | a6f4e080ce2049803dd2bc2cb92447fac50a8d1c (diff) | |
Merge "Mark SurfaceAnimationRunnerTest & AnimatingActivityRegistryTest as flaky"
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java | 1 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java b/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java index c6203c5736fc..a39be565121f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java @@ -60,6 +60,7 @@ public class AnimatingActivityRegistryTest extends WindowTestsBase { } @Test + @FlakyTest(bugId = 144611135) public void testDeferring() { final ActivityRecord activity1 = createActivityRecord(mDisplayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); diff --git a/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java b/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java index 3008a75740e8..e0112809b22b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java @@ -88,6 +88,7 @@ public class SurfaceAnimationRunnerTest extends WindowTestsBase { mFinishCallbackLatch.countDown(); } + @FlakyTest(bugId = 144611135) @Test public void testAnimation() throws Exception { mSurfaceAnimationRunner |