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

Commit d9f9ceb2 authored by Alessandro Recchi's avatar Alessandro Recchi Committed by Automerger Merge Worker
Browse files

Merge "Prevent null references when updating state" into tm-qpr-dev am: 42663b07 

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



Change-Id: I9c65a3d79542b5cc3ce03e4c7e5dc2a267419361
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7874e655 42663b07

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+5 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    protected CentralSurfaces mCentralSurfaces;

    private NotificationPanelViewController mNotificationPanelViewController;

    private BiometricUnlockController mBiometricUnlockController;

    private boolean mCentralSurfacesRegistered;



    private View mNotificationContainer;
@@ -356,6 +357,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mNotificationContainer = notificationContainer;

        mKeyguardMessageAreaController = mKeyguardMessageAreaFactory.create(

                centralSurfaces.getKeyguardMessageArea());

        mCentralSurfacesRegistered = true;



        registerListeners();

    }
@@ -1175,6 +1177,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    };



    protected void updateStates() {

        if (!mCentralSurfacesRegistered) {

            return;

        }

        boolean showing = mKeyguardStateController.isShowing();

        boolean occluded = mKeyguardStateController.isOccluded();

        boolean bouncerShowing = bouncerIsShowing();