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

Commit f5fd9f2a 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

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

Change-Id: Ia774e5581936b20b8dc65a29161601e9c20b71fd
parents 695dbf13 3cefbe75

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

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

    private final Runnable mKeyguardGoingAwayRunnable = new Runnable() {

        @Override

        @Override

        public void run() {

        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");

            Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");

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

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

            mKeyguardViewControllerLazy.get().keyguardGoingAway();

            mKeyguardViewControllerLazy.get().keyguardGoingAway();