Merge "Ignore revealKeyguardIfBouncerPrepared request if Bouncer is null." into rvc-dev

2020-04-24 22:15:30 +00:00
parent 23cc2b8958 9a87d6370d
commit 56669d830c
1 changed files with 7 additions and 0 deletions
--- a/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
+++ b/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
@@ -346,6 +346,13 @@ public class CarKeyguardViewController extends OverlayViewController implements
    private void revealKeyguardIfBouncerPrepared() {
        int reattemptDelayMillis = 50;
        Runnable revealKeyguard = () -> {
+            if (mBouncer == null) {
+                if (DEBUG) {
+                    Log.d(TAG, "revealKeyguardIfBouncerPrepared: revealKeyguard request is ignored "
+                                    + "since the Bouncer has not been initialized yet.");
+                }
+                return;
+            }
            if (!mBouncer.inTransit() || !mBouncer.isSecure()) {
                getLayout().setVisibility(View.VISIBLE);
            } else {