Fixed an issue where the scrim could be lost

When the lockscreen camera was launched, the launch
transition flags were not correctly updated, leading
to the scrim not updating anymore.

Change-Id: Ief5f9eae4d9aacd5177d72e6902451c92552d0d1
Fixes: 28404975

1 files changed, 6 insertions, 5 deletions

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 cf5277f26535..dfc816ca15ce 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -344,8 +344,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
                 if (mOnAnimationFinished != null) {
                     mOnAnimationFinished.run();
                     mOnAnimationFinished = null;
-                    mKeyguardFadingOutInProgress = false;
                 }
+                mKeyguardFadingOutInProgress = false;
                 scrim.setTag(TAG_KEY_ANIM, null);
                 scrim.setTag(TAG_KEY_ANIM_TARGET, null);
             }
@@ -384,10 +384,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
 
     private void endAnimateKeyguardFadingOut(boolean force) {
         mAnimateKeyguardFadingOut = false;
-        if ((force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind)))
-                && mOnAnimationFinished != null) {
-            mOnAnimationFinished.run();
-            mOnAnimationFinished = null;
+        if (force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind))) {
+            if (mOnAnimationFinished != null) {
+                mOnAnimationFinished.run();
+                mOnAnimationFinished = null;
+            }
             mKeyguardFadingOutInProgress = false;
         }
     }