commit dbc0c3a5087832a065ea1796f2a6d386a9a97e22
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 31 19:09:07 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 31 19:09:07 2019 +0000
tree e12b09a59f50d4262ac9225239bc10746ef6a176
parent 6de324573079d2060a315ee20990f67b4d5c240d
parent 97139d19f6d99af00ef1af26dc8edb863adbb99a

Merge "Fixed pulsing notifications and flickers with the scrim"

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 35039a0..f21a9a2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -750,6 +750,11 @@
     }
 
     private void onFinished(Callback callback) {
+        if (mPendingFrameCallback != null) {
+            // No animations can finish while we're waiting on the blanking to finish
+            return;
+
+        }
         if (isAnimating(mScrimBehind)
             || isAnimating(mScrimInFront)
             || isAnimating(mScrimForBubble)) {