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

Commit 016a6b97 authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge "Use alternateBouncerShowing instead of mOccludingAppRequestingFace to... 

Merge "Use alternateBouncerShowing instead of mOccludingAppRequestingFace to trigger face auth while secure camera is launched." into tm-qpr-dev
parents 5f5fe884 a9443a09

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

+3 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ data class KeyguardFaceListenModel( 
    override var userId: Int = 0,

    override var listening: Boolean = false,

    // keep sorted

    var alternateBouncerShowing: Boolean = false,

    var authInterruptActive: Boolean = false,

    var biometricSettingEnabledForUser: Boolean = false,

    var bouncerFullyShown: Boolean = false,
@@ -44,7 +45,6 @@ data class KeyguardFaceListenModel( 
    var secureCameraLaunched: Boolean = false,

    var supportsDetect: Boolean = false,

    var switchingUser: Boolean = false,

    var udfpsBouncerShowing: Boolean = false,

    var udfpsFingerDown: Boolean = false,

    var userNotTrustedOrDetectionIsNeeded: Boolean = false,

) : KeyguardListenModel() {
@@ -73,7 +73,7 @@ data class KeyguardFaceListenModel( 
            secureCameraLaunched.toString(),

            supportsDetect.toString(),

            switchingUser.toString(),

            udfpsBouncerShowing.toString(),

            alternateBouncerShowing.toString(),

            udfpsFingerDown.toString(),

            userNotTrustedOrDetectionIsNeeded.toString(),

        )
@@ -95,6 +95,7 @@ data class KeyguardFaceListenModel( 
                userId = model.userId

                listening = model.listening

                // keep sorted

                alternateBouncerShowing = model.alternateBouncerShowing

                biometricSettingEnabledForUser = model.biometricSettingEnabledForUser

                bouncerFullyShown = model.bouncerFullyShown

                faceAndFpNotAuthenticated = model.faceAndFpNotAuthenticated
@@ -111,7 +112,6 @@ data class KeyguardFaceListenModel( 
                secureCameraLaunched = model.secureCameraLaunched

                supportsDetect = model.supportsDetect

                switchingUser = model.switchingUser

                udfpsBouncerShowing = model.udfpsBouncerShowing

                switchingUser = model.switchingUser

                udfpsFingerDown = model.udfpsFingerDown

                userNotTrustedOrDetectionIsNeeded = model.userNotTrustedOrDetectionIsNeeded

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

+15 −15
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private boolean mGoingToSleep;

    private boolean mPrimaryBouncerFullyShown;

    private boolean mPrimaryBouncerIsOrWillBeShowing;

    private boolean mUdfpsBouncerShowing;

    private boolean mAlternateBouncerShowing;

    private boolean mAuthInterruptActive;

    private boolean mNeedsSlowUnlockTransition;

    private boolean mAssistantVisible;
@@ -536,7 +536,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
     * It's assumed that the trust was granted for the current user.

     */

    private boolean shouldDismissKeyguardOnTrustGrantedWithCurrentUser(TrustGrantFlags flags) {

        final boolean isBouncerShowing = mPrimaryBouncerIsOrWillBeShowing || mUdfpsBouncerShowing;

        final boolean isBouncerShowing =

                mPrimaryBouncerIsOrWillBeShowing || mAlternateBouncerShowing;

        return (flags.isInitiatedByUser() || flags.dismissKeyguardRequested())

                && (mDeviceInteractive || flags.temporaryAndRenewable())

                && (isBouncerShowing || flags.dismissKeyguardRequested());
@@ -1742,7 +1743,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                public void onAuthenticationFailed() {

                        String reason =

                                mKeyguardBypassController.canBypass() ? "bypass"

                                        : mUdfpsBouncerShowing ? "udfpsBouncer"

                                        : mAlternateBouncerShowing ? "alternateBouncer"

                                                : mPrimaryBouncerFullyShown ? "bouncer"

                                                        : "udfpsFpDown";

                        requestActiveUnlock(
@@ -2601,7 +2602,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        requestActiveUnlock(

                requestOrigin,

                extraReason, canFaceBypass

                        || mUdfpsBouncerShowing

                        || mAlternateBouncerShowing

                        || mPrimaryBouncerFullyShown

                        || mAuthController.isUdfpsFingerDown());

    }
@@ -2619,23 +2620,23 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    }



    /**

     * Whether the UDFPS bouncer is showing.

     * Whether the alternate bouncer is showing.

     */

    public void setUdfpsBouncerShowing(boolean showing) {

        mUdfpsBouncerShowing = showing;

        if (mUdfpsBouncerShowing) {

    public void setAlternateBouncerShowing(boolean showing) {

        mAlternateBouncerShowing = showing;

        if (mAlternateBouncerShowing) {

            updateFaceListeningState(BIOMETRIC_ACTION_START,

                    FACE_AUTH_TRIGGERED_ALTERNATE_BIOMETRIC_BOUNCER_SHOWN);

            requestActiveUnlock(

                    ActiveUnlockConfig.ActiveUnlockRequestOrigin.UNLOCK_INTENT,

                    "udfpsBouncer");

                    "alternateBouncer");

        }

    }



    private boolean shouldTriggerActiveUnlock() {

        // Triggers:

        final boolean triggerActiveUnlockForAssistant = shouldTriggerActiveUnlockForAssistant();

        final boolean awakeKeyguard = mPrimaryBouncerFullyShown || mUdfpsBouncerShowing

        final boolean awakeKeyguard = mPrimaryBouncerFullyShown || mAlternateBouncerShowing

                || (isKeyguardVisible() && !mGoingToSleep

                && mStatusBarState != StatusBarState.SHADE_LOCKED);
@@ -2819,7 +2820,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        final boolean isPostureAllowedForFaceAuth =

                mConfigFaceAuthSupportedPosture == 0 /* DEVICE_POSTURE_UNKNOWN */ ? true

                        : (mPostureState == mConfigFaceAuthSupportedPosture);



        // 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 =
@@ -2829,11 +2829,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        || awakeKeyguard

                        || shouldListenForFaceAssistant

                        || isUdfpsFingerDown

                        || mUdfpsBouncerShowing)

                        || mAlternateBouncerShowing)

                && !mSwitchingUser && !faceDisabledForUser && userNotTrustedOrDetectionIsNeeded

                && !mKeyguardGoingAway && biometricEnabledForUser

                && faceAuthAllowedOrDetectionIsNeeded && mIsPrimaryUser

                && (!mSecureCameraLaunched || mOccludingAppRequestingFace)

                && (!mSecureCameraLaunched || mAlternateBouncerShowing)

                && faceAndFpNotAuthenticated

                && !mGoingToSleep

                && isPostureAllowedForFaceAuth;
@@ -2844,6 +2844,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    System.currentTimeMillis(),

                    user,

                    shouldListen,

                    mAlternateBouncerShowing,

                    mAuthInterruptActive,

                    biometricEnabledForUser,

                    mPrimaryBouncerFullyShown,
@@ -2861,7 +2862,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    mSecureCameraLaunched,

                    supportsDetect,

                    mSwitchingUser,

                    mUdfpsBouncerShowing,

                    isUdfpsFingerDown,

                    userNotTrustedOrDetectionIsNeeded));
@@ -3972,7 +3972,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                pw.println("        mPrimaryBouncerIsOrWillBeShowing="

                        + mPrimaryBouncerIsOrWillBeShowing);

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

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

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

            } else if (isSfpsSupported()) {

                pw.println("        sfpsEnrolled=" + isSfpsEnrolled());

                pw.println("        shouldListenForSfps=" + shouldListenForFingerprint(false));

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            mKeyguardMessageAreaController.setMessage("");

        }

        mBypassController.setAltBouncerShowing(isShowingAlternateBouncer);

        mKeyguardUpdateManager.setUdfpsBouncerShowing(isShowingAlternateBouncer);

        mKeyguardUpdateManager.setAlternateBouncerShowing(isShowingAlternateBouncer);



        if (updateScrim) {

            mCentralSurfaces.updateScrimController();

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+11 −7
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    }



    @Test

    public void testShouldListenForFace_whenOccludingAppRequestsFaceAuth_returnsTrue()

    public void shouldListenForFace_secureCameraLaunchedButAlternateBouncerIsLaunched_returnsTrue()

            throws RemoteException {

        // Face auth should run when the following is true.

        keyguardNotGoingAway();
@@ -1783,7 +1783,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 


        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isFalse();



        occludingAppRequestsFaceAuth();

        alternateBouncerVisible();

        mTestableLooper.processAllMessages();



        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isTrue();
@@ -1873,7 +1873,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    }



    @Test

    public void testShouldListenForFace_whenUdfpsBouncerIsShowing_returnsTrue()

    public void testShouldListenForFace_whenAlternateBouncerIsShowing_returnsTrue()

            throws RemoteException {

        // Preconditions for face auth to run

        keyguardNotGoingAway();
@@ -1885,13 +1885,13 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mTestableLooper.processAllMessages();

        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isFalse();



        mKeyguardUpdateMonitor.setUdfpsBouncerShowing(true);

        mKeyguardUpdateMonitor.setAlternateBouncerShowing(true);



        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isTrue();

    }



    @Test

    public void testShouldListenForFace_udfpsBouncerIsShowingButDeviceGoingToSleep_returnsFalse()

    public void testShouldListenForFace_alternateBouncerShowingButDeviceGoingToSleep_returnsFalse()

            throws RemoteException {

        // Preconditions for face auth to run

        keyguardNotGoingAway();
@@ -1901,7 +1901,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        biometricsEnabledForCurrentUser();

        userNotCurrentlySwitching();

        deviceNotGoingToSleep();

        mKeyguardUpdateMonitor.setUdfpsBouncerShowing(true);

        alternateBouncerVisible();

        mTestableLooper.processAllMessages();

        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isTrue();
@@ -1911,6 +1911,10 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isFalse();

    }



    private void alternateBouncerVisible() {

        mKeyguardUpdateMonitor.setAlternateBouncerShowing(true);

    }



    @Test

    public void testShouldListenForFace_whenFaceIsLockedOut_returnsTrue()

            throws RemoteException {
@@ -1921,7 +1925,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        biometricsNotDisabledThroughDevicePolicyManager();

        biometricsEnabledForCurrentUser();

        userNotCurrentlySwitching();

        mKeyguardUpdateMonitor.setUdfpsBouncerShowing(true);

        mKeyguardUpdateMonitor.setAlternateBouncerShowing(true);

        mTestableLooper.processAllMessages();

        assertThat(mKeyguardUpdateMonitor.shouldListenForFace()).isTrue();