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

Commit 33d1c2a2 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Lock face when fingerprint is locked." into sc-v2-dev am: c6d86bbc am: 6486c7b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16459553

Change-Id: I50d15bd2fcf1c27ed9951942034ff7b7ad4d23e6
parents 0b477feb 6486c7b0

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

+9 −16
Original line number Diff line number Diff line
@@ -830,7 +830,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        if (msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT) {

            lockedOutStateChanged |= !mFingerprintLockedOutPermanent;

            mFingerprintLockedOutPermanent = true;

            requireStrongAuthIfAllLockedOut();

            Log.d(TAG, "Fingerprint locked out - requiring strong auth");

            mLockPatternUtils.requireStrongAuth(

                    STRONG_AUTH_REQUIRED_AFTER_LOCKOUT, getCurrentUser());

        }



        if (msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT
@@ -840,6 +842,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            if (isUdfpsEnrolled()) {

                updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);

            }

            stopListeningForFace();

        }



        for (int i = 0; i < mCallbacks.size(); i++) {
@@ -1049,7 +1052,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        if (msgId == FaceManager.FACE_ERROR_LOCKOUT_PERMANENT) {

            lockedOutStateChanged = !mFaceLockedOutPermanent;

            mFaceLockedOutPermanent = true;

            requireStrongAuthIfAllLockedOut();

        }



        if (isHwUnavailable && cameraPrivacyEnabled) {
@@ -1163,19 +1165,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        return faceAuthenticated;

    }



    private void requireStrongAuthIfAllLockedOut() {

        final boolean faceLock =

                (mFaceLockedOutPermanent || !shouldListenForFace()) && !getIsFaceAuthenticated();

        final boolean fpLock =

                mFingerprintLockedOutPermanent || !shouldListenForFingerprint(isUdfpsEnrolled());



        if (faceLock && fpLock) {

            Log.d(TAG, "All biometrics locked out - requiring strong auth");

            mLockPatternUtils.requireStrongAuth(STRONG_AUTH_REQUIRED_AFTER_LOCKOUT,

                    getCurrentUser());

        }

    }



    public boolean getUserCanSkipBouncer(int userId) {

        return getUserHasTrust(userId) || getUserUnlockedWithBiometric(userId);

    }
@@ -2373,6 +2362,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_BOOT)

                        || containsFlag(strongAuth, STRONG_AUTH_REQUIRED_AFTER_TIMEOUT);



        // TODO: always disallow when fp is already locked out?

        final boolean fpLockedout = mFingerprintLockedOut || mFingerprintLockedOutPermanent;



        final boolean canBypass = mKeyguardBypassController != null

                && mKeyguardBypassController.canBypass();

        // There's no reason to ask the HAL for authentication when the user can dismiss the
@@ -2407,7 +2399,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                && !mKeyguardGoingAway && biometricEnabledForUser && !mLockIconPressed

                && strongAuthAllowsScanning && mIsPrimaryUser

                && (!mSecureCameraLaunched || mOccludingAppRequestingFace)

                && !faceAuthenticated;

                && !faceAuthenticated

                && !fpLockedout;



        // Aggregate relevant fields for debug logging.

        if (DEBUG_FACE || DEBUG_SPEW) {

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

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mKeyguardUpdateMonitor.mFingerprintAuthenticationCallback

                .onAuthenticationError(FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT, "");



        verify(mLockPatternUtils, never()).requireStrongAuth(anyInt(), anyInt());

        verify(mLockPatternUtils).requireStrongAuth(anyInt(), anyInt());

    }