commit 2fd4e812bb3ad853857dcba20e7c6ce44977fee2
author Vishnu Nair <vishnun@google.com> Sat May 25 00:10:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sat May 25 00:10:36 2019 -0700
tree 0d373f721010f7c6ae937d27468c4f0383cb6a3b
parent 87237dd66555a7ea217ef3a614f61c76d49d4970
parent 80c94712de4382720f44104c4c67fa377861406e

Merge "Mark RemoteAnimationControllerTest#testTimeout as flaky" into qt-dev
am: 80c94712de

Change-Id: Icc43e96c04f74d9d682f4ace617476eb577e99a5

services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java
index b867799..cb74c3e 100644
--- a/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java
@@ -40,6 +40,7 @@
 import android.view.SurfaceControl;
 import android.view.SurfaceControl.Transaction;
 
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 
 import com.android.server.testutils.OffsettableClock;
@@ -131,6 +132,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 133372977)
     public void testTimeout() throws Exception {
         final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
         final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,