Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da3bf3bb authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "ScrimController: Wait with clearing wakup animation until done" into... 

Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am: 6e4de6cc am: 3d8fd6e4
am: 5149fa45

Change-Id: I60419fa88eaf52cb3ce30775881b5fa62c446ada
parents 5f65a480 5149fa45

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

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
                    mKeyguardFadingOutInProgress = false;

                    mAnimatingDozeUnlock = false;

                }

                if (mWakingUpFromAodAnimationRunning) {

                if (mWakingUpFromAodAnimationRunning && !mDeferFinishedListener) {

                    mWakingUpFromAodAnimationRunning = false;

                    mWakingUpFromAodInProgress = false;

                }