summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt
index 209df6b54f8f..d4c3840356d1 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt
@@ -86,7 +86,14 @@ class DialogLaunchAnimatorTest : SysuiTestCase() {
assertFalse(dialog.isShowing)
assertFalse(dialog.onStopCalled)
- runOnMainThreadAndWaitForIdleSync { dialog.dismiss() }
+ runOnMainThreadAndWaitForIdleSync {
+ // TODO(b/204561691): Remove this call to disableAllCurrentDialogsExitAnimations() and
+ // make sure that the test still pass on git_master/cf_x86_64_phone-userdebug in
+ // Forrest.
+ dialogLaunchAnimator.disableAllCurrentDialogsExitAnimations()
+
+ dialog.dismiss()
+ }
assertFalse(hostDialog.isShowing)
assertFalse(dialog.isShowing)
assertTrue(hostDialog.wasDismissed)