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

Commit a39c951e authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Remove unnecessary (and potentially problematic) call of... 

[automerge] Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks. 2p: ac8355b6

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

Bug: 221866693
Change-Id: I54383cb9d94f045b7f1d0115898c463d17dfb281
parents 6a30a22e ac8355b6

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) {