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

Commit 2ea91422 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [16480615] into sc-v2-release.

Change-Id: I528cb89ccd563ea14a0589b4af3b0759dd941a75
parents c6ce0751 87ab0686
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -2093,15 +2093,6 @@ public class KeyguardViewMediator extends SystemUI 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();