Merge "Remove flaky test from BubbleBarViewAnimatorTest" into main

1 files changed, 0 insertions, 37 deletions

diff --git a/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt b/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt
index 61a697503e..8f26795045 100644
--- a/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt
+++ b/quickstep/tests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt
@@ -316,43 +316,6 @@ class BubbleBarViewAnimatorTest {
     }
 
     @Test
-    fun animateBubbleInForStashed_showAnimationCanceled() {
-        setUpBubbleBar()
-
-        val handle = View(context)
-        val handleAnimator = PhysicsAnimator.getInstance(handle)
-        bubbleStashController.handleAnimator = handleAnimator
-
-        val animator =
-            BubbleBarViewAnimator(
-                bubbleBarView,
-                bubbleStashController,
-                flyoutController,
-                bubbleBarParentViewController,
-                onExpanded = emptyRunnable,
-                onBubbleBarVisible = emptyRunnable,
-                animatorScheduler,
-            )
-
-        InstrumentationRegistry.getInstrumentation().runOnMainSync {
-            animator.animateBubbleInForStashed(bubble, isExpanding = false)
-        }
-
-        // wait for the animation to start
-        InstrumentationRegistry.getInstrumentation().runOnMainSync {}
-        PhysicsAnimatorTestUtils.blockUntilFirstAnimationFrameWhereTrue(handleAnimator) { true }
-
-        handleAnimator.assertIsRunning()
-        assertThat(animator.isAnimating).isTrue()
-        assertThat(animatorScheduler.delayedBlock).isNotNull()
-
-        handleAnimator.cancel()
-        handleAnimator.assertIsNotRunning()
-        assertThat(animator.isAnimating).isFalse()
-        assertThat(animatorScheduler.delayedBlock).isNull()
-    }
-
-    @Test
     fun animateBubbleInForStashed_autoExpanding() {
         setUpBubbleBar()