Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9765d6a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore revealKeyguardIfBouncerPrepared request if Bouncer is null."... 

Merge "Ignore revealKeyguardIfBouncerPrepared request if Bouncer is null." into rvc-dev am: 56669d83 am: fd6edae2

Change-Id: I90e0eaf746ff4579ce42165a1f9c2c39876fa924
parents 5c0fe343 fd6edae2

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

+7 −0
Original line number Diff line number Diff line
@@ -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 {