Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent null references when updating state" into tm-qpr-dev

Browse Source
This commit is contained in:
Alessandro Recchi
2022-10-17 15:49:30 +00:00
committed by Android (Google) Code Review
parent ec8ab3a6c8 0e59150349
commit 42663b07ef
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,6 +225,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
protected CentralSurfaces mCentralSurfaces; protected CentralSurfaces mCentralSurfaces;
private NotificationPanelViewController mNotificationPanelViewController; private NotificationPanelViewController mNotificationPanelViewController;
private BiometricUnlockController mBiometricUnlockController; private BiometricUnlockController mBiometricUnlockController;
private boolean mCentralSurfacesRegistered;
private View mNotificationContainer; private View mNotificationContainer;
@@ -356,6 +357,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mNotificationContainer = notificationContainer; mNotificationContainer = notificationContainer;
mKeyguardMessageAreaController = mKeyguardMessageAreaFactory.create( mKeyguardMessageAreaController = mKeyguardMessageAreaFactory.create(
centralSurfaces.getKeyguardMessageArea()); centralSurfaces.getKeyguardMessageArea());
mCentralSurfacesRegistered = true;
registerListeners(); registerListeners();
} }
@@ -1175,6 +1177,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
}; };
protected void updateStates() { protected void updateStates() {
if (!mCentralSurfacesRegistered) {
return;
}
boolean showing = mKeyguardStateController.isShowing(); boolean showing = mKeyguardStateController.isShowing();
boolean occluded = mKeyguardStateController.isOccluded(); boolean occluded = mKeyguardStateController.isOccluded();
boolean bouncerShowing = bouncerIsShowing(); boolean bouncerShowing = bouncerIsShowing();