Merge "Prevent null references when updating state" into tm-qpr-dev (42663b07) · Commits · e / os / android_frameworks_base

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();