Merge "Add mBouncer null checks for view-related requests." into rvc-dev (66bf0f53) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -151,8 +151,10 @@ public class CarKeyguardViewController extends OverlayViewController implements

		@Override
		public void notifyKeyguardAuthenticated(boolean strongAuth) {
		if (mBouncer != null) {
		mBouncer.notifyKeyguardAuthenticated(strongAuth);
		}
		}

		@Override
		public void showBouncer(boolean scrimmed) {
		@@ -204,11 +206,15 @@ public class CarKeyguardViewController extends OverlayViewController implements

		@Override
		public void onFinishedGoingToSleep() {
		if (mBouncer != null) {
		mBouncer.onScreenTurnedOff();
		}
		}

		@Override
		public void onCancelClicked() {
		if (!mShowing) return;

		getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);
		getOverlayViewGlobalStateController().setWindowNeedsInput(/* needsInput= */ false);

		@@ -228,6 +234,8 @@ public class CarKeyguardViewController extends OverlayViewController implements

		@Override
		public void startPreHideAnimation(Runnable finishRunnable) {
		if (!mShowing) return;

		mBouncer.startPreHideAnimation(finishRunnable);
		}

		@@ -260,12 +268,12 @@ public class CarKeyguardViewController extends OverlayViewController implements

		@Override
		public boolean isBouncerShowing() {
		return mBouncer.isShowing();
		return mBouncer != null && mBouncer.isShowing();
		}

		@Override
		public boolean bouncerIsOrWillBeShowing() {
		return mBouncer.isShowing() \|\| mBouncer.inTransit();
		return mBouncer != null && (mBouncer.isShowing() \|\| mBouncer.inTransit());
		}

		@Override