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

Commit c89796fd authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Separate out bouncer updates 

Some callbacks want to know when the bouncer
starts transitioning to show (ie: UDFPS animations)
while other callbacks only care if the bouncer
actually fully showed (ie: running face auth).

We want to make sure we don't over-trigger
face auth, so only request face auth when
we know the bouncer is fully shown rather
than in the middle of a transition to potentially
showing the bouncer (sometimes it can be quickly
cancelled).

Test: atest SystemUITests
Fixes: 226967764
Change-Id: Ifca6fb1861992a78815066571019226322260279
parent a66381ab

packages/SystemUI/src/com/android/keyguard/KeyguardListenModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ data class KeyguardFingerprintListenModel( 
    override val listening: Boolean,

    // keep sorted

    val biometricEnabledForUser: Boolean,

    val bouncer: Boolean,

    val bouncerIsOrWillShow: Boolean,

    val canSkipBouncer: Boolean,

    val credentialAttempted: Boolean,

    val deviceInteractive: Boolean,
@@ -51,7 +51,7 @@ data class KeyguardFaceListenModel( 
    val authInterruptActive: Boolean,

    val becauseCannotSkipBouncer: Boolean,

    val biometricSettingEnabledForUser: Boolean,

    val bouncer: Boolean,

    val bouncerFullyShown: Boolean,

    val faceAuthenticated: Boolean,

    val faceDisabled: Boolean,

    val keyguardAwake: Boolean,

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+52 −23
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private boolean mCredentialAttempted;

    private boolean mKeyguardGoingAway;

    private boolean mGoingToSleep;

    private boolean mBouncer; // true if bouncerIsOrWillBeShowing

    private boolean mBouncerFullyShown;

    private boolean mBouncerIsOrWillBeShowing;

    private boolean mAuthInterruptActive;

    private boolean mNeedsSlowUnlockTransition;

    private boolean mAssistantVisible;
@@ -1865,7 +1866,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        handleKeyguardReset();

                        break;

                    case MSG_KEYGUARD_BOUNCER_CHANGED:

                        handleKeyguardBouncerChanged(msg.arg1);

                        handleKeyguardBouncerChanged(msg.arg1, msg.arg2);

                        break;

                    case MSG_USER_INFO_CHANGED:

                        handleUserInfoChanged(msg.arg1);
@@ -2355,7 +2356,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        final boolean shouldListenKeyguardState =

                mKeyguardIsVisible

                        || !mDeviceInteractive

                        || (mBouncer && !mKeyguardGoingAway)

                        || (mBouncerIsOrWillBeShowing && !mKeyguardGoingAway)

                        || mGoingToSleep

                        || shouldListenForFingerprintAssistant

                        || (mKeyguardOccluded && mIsDreaming)
@@ -2375,7 +2376,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        && biometricEnabledForUser;



        final boolean shouldListenBouncerState =

                !(mFingerprintLockedOut && mBouncer && mCredentialAttempted);

                !(mFingerprintLockedOut && mBouncerIsOrWillBeShowing && mCredentialAttempted);



        final boolean isEncryptedOrLockdownForUser = isEncryptedOrLockdown(user);

        final boolean shouldListenUdfpsState = !isUdfps
@@ -2394,7 +2395,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        user,

                        shouldListen,

                        biometricEnabledForUser,

                        mBouncer,

                        mBouncerIsOrWillBeShowing,

                        userCanSkipBouncer,

                        mCredentialAttempted,

                        mDeviceInteractive,
@@ -2450,7 +2451,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


        // Scan even when encrypted or timeout to show a preemptive bouncer when bypassing.

        // Lock-down mode shouldn't scan, since it is more explicit.

        boolean strongAuthAllowsScanning = (!isEncryptedOrTimedOut || canBypass && !mBouncer);

        boolean strongAuthAllowsScanning = (!isEncryptedOrTimedOut || canBypass

                && !mBouncerFullyShown);



        // If the device supports face detection (without authentication), allow it to happen

        // if the device is in lockdown mode. Otherwise, prevent scanning.
@@ -2469,8 +2471,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        // Only listen if this KeyguardUpdateMonitor belongs to the primary user. There is an

        // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.

        final boolean shouldListen =

                (mBouncer || mAuthInterruptActive || mOccludingAppRequestingFace || awakeKeyguard

                        || shouldListenForFaceAssistant)

                (mBouncerFullyShown || mAuthInterruptActive || mOccludingAppRequestingFace

                        || awakeKeyguard || shouldListenForFaceAssistant)

                && !mSwitchingUser && !faceDisabledForUser && becauseCannotSkipBouncer

                && !mKeyguardGoingAway && biometricEnabledForUser && !mLockIconPressed

                && strongAuthAllowsScanning && mIsPrimaryUser
@@ -2488,7 +2490,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        mAuthInterruptActive,

                        becauseCannotSkipBouncer,

                        biometricEnabledForUser,

                        mBouncer,

                        mBouncerFullyShown,

                        faceAuthenticated,

                        faceDisabledForUser,

                        awakeKeyguard,
@@ -3050,13 +3052,21 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    /**

     * Handle {@link #MSG_KEYGUARD_BOUNCER_CHANGED}

     *

     * @see #sendKeyguardBouncerChanged(boolean)

     * @see #sendKeyguardBouncerChanged(boolean, boolean)

     */

    private void handleKeyguardBouncerChanged(int bouncerVisible) {

    private void handleKeyguardBouncerChanged(int bouncerIsOrWillBeShowing, int bouncerFullyShown) {

        Assert.isMainThread();

        if (DEBUG) Log.d(TAG, "handleKeyguardBouncerChanged(" + bouncerVisible + ")");

        mBouncer = bouncerVisible == 1;

        if (mBouncer) {

        final boolean wasBouncerIsOrWillBeShowing = mBouncerIsOrWillBeShowing;

        final boolean wasBouncerFullyShown = mBouncerFullyShown;

        mBouncerIsOrWillBeShowing = bouncerIsOrWillBeShowing == 1;

        mBouncerFullyShown = bouncerFullyShown == 1;

        if (DEBUG) {

            Log.d(TAG, "handleKeyguardBouncerChanged"

                    + " bouncerIsOrWillBeShowing=" + mBouncerIsOrWillBeShowing

                    + " bouncerFullyShowing=" + mBouncerFullyShown);

        }



        if (mBouncerFullyShown) {

            // If the bouncer is shown, always clear this flag. This can happen in the following

            // situations: 1) Default camera with SHOW_WHEN_LOCKED is not chosen yet. 2) Secure

            // camera requests dismiss keyguard (tapping on photos for example). When these happen,
@@ -3066,13 +3076,25 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            mCredentialAttempted = false;

        }



        if (wasBouncerIsOrWillBeShowing != mBouncerIsOrWillBeShowing) {

            for (int i = 0; i < mCallbacks.size(); i++) {

                KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

                if (cb != null) {

                cb.onKeyguardBouncerChanged(mBouncer);

                    cb.onKeyguardBouncerStateChanged(mBouncerIsOrWillBeShowing);

                }

            }

        updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE);

            updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);

        }



        if (wasBouncerFullyShown != mBouncerFullyShown) {

            for (int i = 0; i < mCallbacks.size(); i++) {

                KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

                if (cb != null) {

                    cb.onKeyguardBouncerFullyShowingChanged(mBouncerFullyShown);

                }

            }

            updateFaceListeningState(BIOMETRIC_ACTION_UPDATE);

        }

    }



    /**
@@ -3219,12 +3241,18 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    }



    /**

     * @see #handleKeyguardBouncerChanged(int)

     * @see #handleKeyguardBouncerChanged(int, int)

     */

    public void sendKeyguardBouncerChanged(boolean bouncerIsOrWillBeShowing) {

        if (DEBUG) Log.d(TAG, "sendKeyguardBouncerChanged(" + bouncerIsOrWillBeShowing + ")");

    public void sendKeyguardBouncerChanged(boolean bouncerIsOrWillBeShowing,

            boolean bouncerFullyShown) {

        if (DEBUG) {

            Log.d(TAG, "sendKeyguardBouncerChanged"

                    + " bouncerIsOrWillBeShowing=" + bouncerIsOrWillBeShowing

                    + " bouncerFullyShown=" + bouncerFullyShown);

        }

        Message message = mHandler.obtainMessage(MSG_KEYGUARD_BOUNCER_CHANGED);

        message.arg1 = bouncerIsOrWillBeShowing ? 1 : 0;

        message.arg2 = bouncerFullyShown ? 1 : 0;

        message.sendToTarget();

    }
@@ -3561,7 +3589,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            if (isUdfpsSupported()) {

                pw.println("        udfpsEnrolled=" + isUdfpsEnrolled());

                pw.println("        shouldListenForUdfps=" + shouldListenForFingerprint(true));

                pw.println("        bouncerVisible=" + mBouncer);

                pw.println("        mBouncerIsOrWillBeShowing=" + mBouncerIsOrWillBeShowing);

                pw.println("        mStatusBarState=" + StatusBarState.toString(mStatusBarState));

            }

        }
@@ -3585,6 +3613,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            pw.println("    mFaceLockedOutPermanent=" + mFaceLockedOutPermanent);

            pw.println("    enabledByUser=" + mBiometricEnabledForUser.get(userId));

            pw.println("    mSecureCameraLaunched=" + mSecureCameraLaunched);

            pw.println("    mBouncerFullyShown=" + mBouncerFullyShown);

        }

        mListenModels.print(pw);

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java

+9 −3
Original line number Diff line number Diff line
@@ -97,10 +97,16 @@ public class KeyguardUpdateMonitorCallback { 


    /**

     * Called when the keyguard enters or leaves bouncer mode.

     * @param bouncer if true, keyguard is showing the bouncer or transitioning from/to bouncer

     *                mode.

     * @param bouncerIsOrWillBeShowing if true, keyguard is showing the bouncer or transitioning

     *                                 from/to bouncer mode.

     */

    public void onKeyguardBouncerChanged(boolean bouncer) { }

    public void onKeyguardBouncerStateChanged(boolean bouncerIsOrWillBeShowing) { }



    /**

     * Called when the keyguard fully transitions to the bouncer or is no longer the bouncer

     * @param bouncerIsFullyShowing if true, keyguard is fully showing the bouncer

     */

    public void onKeyguardBouncerFullyShowingChanged(boolean bouncerIsFullyShowing) { }



    /**

     * Called when visibility of lockscreen clock changes, such as when

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
                }



                @Override

                public void onKeyguardBouncerChanged(boolean bouncer) {

                public void onKeyguardBouncerStateChanged(boolean bouncer) {

                    mIsBouncerShowing = bouncer;

                    updateVisibility();

                }

packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ class AuthRippleController @Inject constructor( 
            }

        }



        override fun onKeyguardBouncerChanged(bouncerIsOrWillBeShowing: Boolean) {

        override fun onKeyguardBouncerStateChanged(bouncerIsOrWillBeShowing: Boolean) {

            if (bouncerIsOrWillBeShowing) {

                mView.fadeDwellRipple()

            }