| commit | 696fae49f12bde9840dfe7e4c78e5900b023d18c | [log] [tgz] |
|---|---|---|
| author | Jordan Demeulenaere <jdemeulenaere@google.com> | Fri Nov 12 11:08:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 12 11:08:14 2021 +0000 |
| tree | 05cc712b911c8c1c6582b29230f208ea30042ed4 | |
| parent | a54d51b06eef1b00b19c1ef36142e44d93de4da9 [diff] | |
| parent | c35d7beb06d0e463f2e5ba07ddc5dafd8d1266e3 [diff] |
Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev am: d7b0a36294 am: c35d7beb06 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16174250 Change-Id: I71a82cc6270408c2774d32355e0365a0fc3f74d7
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 209df6b..d4c3840 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 @@ 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)