diff options
| author | Jordan Demeulenaere <jdemeulenaere@google.com> | 2022-03-09 14:55:07 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-15 06:55:35 +0000 |
| commit | 274eecfba13a77ff22fbb43115ff95dded3749ee (patch) | |
| tree | 4ab6f9ee8c9a1ed7ebcc6e24191742dbd2dfe689 | |
| parent | 567eb2dde4e4b3253b3ca72ce39d822a24469c4d (diff) | |
| download | base-274eecfba13a77ff22fbb43115ff95dded3749ee.tar.gz | |
Fix dialog exit animation
This CL fixes a bug that could happen when animating a dialog out at the
same time as hiding the SystemUI shade, and that would make the phone
unusable until the shade is swiped down again. See b/223387276 for more
info.
Bug: 223387276
Test: Manual, see b/223387276#comment1
Change-Id: If251b00558a5ca9a927d1be2bb015f1c0acb2d57
(cherry picked from commit 631a7ef1a60a8d61077e1762e5a18cc53e8211f4)
Merged-In: If251b00558a5ca9a927d1be2bb015f1c0acb2d57
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index f1eb783726db..0b19f4f44653 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3390,6 +3390,12 @@ public final class ViewRootImpl implements ViewParent, mReportNextDraw = false; pendingDrawFinished(); } + + // Make sure the consumer is not waiting if the view root was just made invisible. + if (mBLASTDrawConsumer != null) { + mBLASTDrawConsumer.accept(null); + mBLASTDrawConsumer = null; + } } } |