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

Commit 25e2a5e4 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-9863077b6245445fa6d0b447dd170c6f" into tm-mainline-prod 

* changes:
  [automerge] Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks. 2p: ac8355b6
  Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks.
parents e259dc6f a39c951e

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

+5 −2
Original line number Diff line number Diff line
@@ -2009,7 +2009,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                case KEYGUARD_TIMEOUT:

                    synchronized (KeyguardViewMediator.this) {

                        doKeyguardLocked((Bundle) msg.obj);

                        notifyDefaultDisplayCallbacks(mShowing);

                    }

                    break;

                case DISMISS:
@@ -2955,14 +2954,18 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 


    private void setShowingLocked(boolean showing, boolean forceCallbacks) {

        final boolean aodShowing = mDozing && !mScreenOnCoordinator.getWakeAndUnlocking();

        final boolean notifyDefaultDisplayCallbacks = showing != mShowing

        final boolean notifyDefaultDisplayCallbacks = showing != mShowing || forceCallbacks;

        final boolean updateActivityLockScreenState = showing != mShowing

                || aodShowing != mAodShowing || forceCallbacks;

        mShowing = showing;

        mAodShowing = aodShowing;

        if (notifyDefaultDisplayCallbacks) {

            notifyDefaultDisplayCallbacks(showing);

        }

        if (updateActivityLockScreenState) {

            updateActivityLockScreenState(showing, aodShowing);

        }



    }



    private void notifyDefaultDisplayCallbacks(boolean showing) {