Merge "Add mBouncer null checks for view-related requests." into rvc-dev am: 66bf0f533c

Change-Id: I73f01907fd7bb87ca5510ef52d7a477c34784799

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

@@ -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