commit 8b35c2df423e5912e84fc19e6bc63ebac2775ceb
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 02 00:03:30 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 02 00:03:30 2018 +0000
tree a9033b030acb2eb948b7a5ff319d2e66c04ab92e
parent 0d52450ca6b49f3c844f65e6daf35c69bb360d1c
parent d694161c50137546cf494b39bcec4d5e5733af84

Merge "WM: Mark RecentsAnimationControllerTest#testIncludedApps_expectTargetAndVisible as flaky"

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

diff --git a/services/tests/servicestests/src/com/android/server/wm/RecentsAnimationControllerTest.java b/services/tests/servicestests/src/com/android/server/wm/RecentsAnimationControllerTest.java
index aaa00452..088e229 100644
--- a/services/tests/servicestests/src/com/android/server/wm/RecentsAnimationControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/wm/RecentsAnimationControllerTest.java
@@ -40,6 +40,7 @@
 import android.view.IRecentsAnimationRunner;
 import android.view.SurfaceControl;
 
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -114,6 +115,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 117117823)
     public void testIncludedApps_expectTargetAndVisible() throws Exception {
         sWm.setRecentsAnimationController(mController);
         final AppWindowToken homeAppWindow = createAppWindowToken(mDisplayContent,