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

Commit 4e4fb4e6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove check preventing keyguardGoingAwayRunnable from being called if... 

Merge "Remove check preventing keyguardGoingAwayRunnable from being called if it's already going away." into sc-v2-dev am: 3cefbe75 am: f5fd9f2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16480615

Change-Id: Icded49c439fb75ea0eb81cc26dd3719839d76eec
parents 9473084f f5fd9f2a

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+0 −9
Original line number Diff line number Diff line
@@ -2107,15 +2107,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
    private final Runnable mKeyguardGoingAwayRunnable = new Runnable() {

        @Override

        public void run() {

            // If the keyguard is already going away, or it's about to because we are going to

            // trigger the going-away remote animation to show the surface behind, don't do it

            // again. That will cause the current animation to be cancelled unnecessarily.

            if (mKeyguardStateController.isKeyguardGoingAway()

                    || mSurfaceBehindRemoteAnimationRequested

                    || mSurfaceBehindRemoteAnimationRunning) {

                return;

            }



            Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");

            if (DEBUG) Log.d(TAG, "keyguardGoingAway");

            mKeyguardViewControllerLazy.get().keyguardGoingAway();