Merge "Ignore more flaky tests." into qt-dev am: d31c9628c9 am: f383ad4963

am: a58873d15f

Change-Id: I84418a4bc084c9b116a6ce1173ac2fc77210f45b

packages/SystemUI/tests/src/com/android/systemui/bubbles/animation/ExpandedAnimationControllerTest.java

@@ -145,6 +145,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
     }
 
     @Test
+    @Ignore("Flaky")
     public void testMagnetToDismiss_dismiss() throws InterruptedException {
         expand();
 

packages/SystemUI/tests/src/com/android/systemui/bubbles/animation/StackAnimationControllerTest.java

@@ -234,6 +234,7 @@ public class StackAnimationControllerTest extends PhysicsAnimationLayoutTestCase
     }
 
     @Test
+    @Ignore("Flaky")
     public void testMagnetToDismiss_dismiss() throws InterruptedException {
         final Runnable after = Mockito.mock(Runnable.class);