From 273dc063732ee1b8a61033949b7683b006d6ac4d Mon Sep 17 00:00:00 2001
From: Jordan Demeulenaere <jdemeulenaere@google.com>
Date: Tue, 2 Nov 2021 09:34:04 +0100
Subject: [PATCH] Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView

This is a temporary fix to make #testShowDialogFromView pass on
git_master/cf_x86_64_phone-userdebug.

Bug: 204589809
Bug: 204561691
Test: https://android-build.googleplex.com/builds/abtd/run/L96200000951897805
Change-Id: I28fe649fde6a107ee939ae8e85090972899f5d17
---
 .../systemui/animation/DialogLaunchAnimatorTest.kt       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 209df6b54f8f0..d4c3840356d15 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)