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

Commit 5b54d892 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Update KeyguardUpdateMonitor to use biometricStrength" into udc-dev am: 613c69a8 

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



Change-Id: Ia09ad1789ce7d023816d2df816e6fe3547df2092
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41311ea8 613c69a8

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

+44 −22
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ import android.hardware.biometrics.BiometricManager; 
import android.hardware.biometrics.BiometricSourceType;

import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;

import android.hardware.biometrics.SensorProperties;

import android.hardware.biometrics.SensorPropertiesInternal;

import android.hardware.face.FaceAuthenticateOptions;

import android.hardware.face.FaceManager;

import android.hardware.face.FaceSensorPropertiesInternal;
@@ -1278,6 +1279,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        if (msgId == FaceManager.FACE_ERROR_LOCKOUT_PERMANENT) {

            lockedOutStateChanged = !mFaceLockedOutPermanent;

            mFaceLockedOutPermanent = true;

            if (isFaceClass3()) {

                updateFingerprintListeningState(BIOMETRIC_ACTION_STOP);

            }

        }



        if (isHwUnavailable && cameraPrivacyEnabled) {
@@ -1487,8 +1491,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        // STRONG_AUTH_REQUIRED_AFTER_LOCKOUT which is the same as mFingerprintLockedOutPermanent;

        // however the strong auth tracker does not include the temporary lockout

        // mFingerprintLockedOut.

        // Class 3 biometric lockout will lockout ALL biometrics

        return mStrongAuthTracker.isUnlockingWithBiometricAllowed(isStrongBiometric)

                && !mFingerprintLockedOut;

                && (!isFingerprintClass3() || !isFingerprintLockedOut())

                && (!isFaceClass3() || !mFaceLockedOutPermanent);

    }



    /**
@@ -1506,9 +1512,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            @NonNull BiometricSourceType biometricSourceType) {

        switch (biometricSourceType) {

            case FINGERPRINT:

                return isUnlockingWithBiometricAllowed(true);

                return isUnlockingWithBiometricAllowed(isFingerprintClass3());

            case FACE:

                return isUnlockingWithBiometricAllowed(false);

                return isUnlockingWithBiometricAllowed(isFaceClass3());

            default:

                return false;

        }
@@ -2473,7 +2479,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    }



    private void updateFaceEnrolled(int userId) {

        Boolean isFaceEnrolled = mFaceManager != null && !mFaceSensorProperties.isEmpty()

        final Boolean isFaceEnrolled = isFaceSupported()

                && mBiometricEnabledForUser.get(userId)

                && mAuthController.isFaceAuthEnrolled(userId);

        if (mIsFaceEnrolled != isFaceEnrolled) {
@@ -2482,10 +2488,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mIsFaceEnrolled = isFaceEnrolled;

    }



    public boolean isFaceSupported() {

    private boolean isFaceSupported() {

        return mFaceManager != null && !mFaceSensorProperties.isEmpty();

    }



    private boolean isFingerprintSupported() {

        return mFpm != null && !mFingerprintSensorProperties.isEmpty();

    }



    /**

     * @return true if there's at least one udfps enrolled for the current user.

     */
@@ -2792,10 +2802,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                || !mLockPatternUtils.isSecure(user);



        // Don't trigger active unlock if fp is locked out

        final boolean fpLockedOut = mFingerprintLockedOut || mFingerprintLockedOutPermanent;

        final boolean fpLockedOut = isFingerprintLockedOut();



        // Don't trigger active unlock if primary auth is required

        final boolean primaryAuthRequired = !isUnlockingWithBiometricAllowed(true);

        final boolean primaryAuthRequired = !isUnlockingWithTrustAgentAllowed();



        final boolean shouldTriggerActiveUnlock =

                (mAuthInterruptActive || triggerActiveUnlockForAssistant || awakeKeyguard)
@@ -2949,7 +2959,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        // allow face detection to happen even if stronger auth is required. When face is detected,

        // we show the bouncer. However, if the user manually locked down the device themselves,

        // never attempt to detect face.

        final boolean supportsDetect = !mFaceSensorProperties.isEmpty()

        final boolean supportsDetect = isFaceSupported()

                && mFaceSensorProperties.get(0).supportsFaceDetection

                && canBypass && !mPrimaryBouncerIsOrWillBeShowing

                && !isUserInLockdown(user);
@@ -3104,7 +3114,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                                    : WAKE_REASON_UNKNOWN

                    ).toFaceAuthenticateOptions();

            // This would need to be updated for multi-sensor devices

            final boolean supportsFaceDetection = !mFaceSensorProperties.isEmpty()

            final boolean supportsFaceDetection = isFaceSupported()

                    && mFaceSensorProperties.get(0).supportsFaceDetection;

            if (!isUnlockingWithBiometricAllowed(FACE)) {

                final boolean udfpsFingerprintAuthRunning = isUdfpsSupported()
@@ -3166,21 +3176,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
     * @return {@code true} if possible.

     */

    public boolean isUnlockingWithNonStrongBiometricsPossible(int userId) {

        // This assumes that there is at most one face and at most one fingerprint sensor

        return (mFaceManager != null && !mFaceSensorProperties.isEmpty()

                && (mFaceSensorProperties.get(0).sensorStrength != SensorProperties.STRENGTH_STRONG)

                && isUnlockWithFacePossible(userId))

                || (mFpm != null && !mFingerprintSensorProperties.isEmpty()

                && (mFingerprintSensorProperties.get(0).sensorStrength

                != SensorProperties.STRENGTH_STRONG) && isUnlockWithFingerprintPossible(userId));

        return (!isFaceClass3() && isUnlockWithFacePossible(userId))

                || (isFingerprintClass3() && isUnlockWithFingerprintPossible(userId));

    }



    @SuppressLint("MissingPermission")

    @VisibleForTesting

    boolean isUnlockWithFingerprintPossible(int userId) {

        // TODO (b/242022358), make this rely on onEnrollmentChanged event and update it only once.

        boolean newFpEnrolled = mFpm != null

                && !mFingerprintSensorProperties.isEmpty()

        boolean newFpEnrolled = isFingerprintSupported()

                && !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId);

        Boolean oldFpEnrolled = mIsUnlockWithFingerprintPossible.getOrDefault(userId, false);

        if (oldFpEnrolled != newFpEnrolled) {
@@ -3330,12 +3334,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


        // Immediately stop previous biometric listening states.

        // Resetting lockout states updates the biometric listening states.

        if (mFaceManager != null && !mFaceSensorProperties.isEmpty()) {

        if (isFaceSupported()) {

            stopListeningForFace(FACE_AUTH_UPDATED_USER_SWITCHING);

            handleFaceLockoutReset(mFaceManager.getLockoutModeForUser(

                    mFaceSensorProperties.get(0).sensorId, userId));

        }

        if (mFpm != null && !mFingerprintSensorProperties.isEmpty()) {

        if (isFingerprintSupported()) {

            stopListeningForFingerprint();

            handleFingerprintLockoutReset(mFpm.getLockoutModeForUser(

                    mFingerprintSensorProperties.get(0).sensorId, userId));
@@ -4071,6 +4075,22 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        return BIOMETRIC_LOCKOUT_RESET_DELAY_MS;

    }



    @VisibleForTesting

    protected boolean isFingerprintClass3() {

        // This assumes that there is at most one fingerprint sensor property

        return isFingerprintSupported() && isClass3Biometric(mFingerprintSensorProperties.get(0));

    }



    @VisibleForTesting

    protected boolean isFaceClass3() {

        // This assumes that there is at most one face sensor property

        return isFaceSupported() && isClass3Biometric(mFaceSensorProperties.get(0));

    }



    private boolean isClass3Biometric(SensorPropertiesInternal sensorProperties) {

        return sensorProperties.sensorStrength == SensorProperties.STRENGTH_STRONG;

    }



    /**

     * Unregister all listeners.

     */
@@ -4122,11 +4142,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        for (int subId : mServiceStates.keySet()) {

            pw.println("    " + subId + "=" + mServiceStates.get(subId));

        }

        if (mFpm != null && !mFingerprintSensorProperties.isEmpty()) {

        if (isFingerprintSupported()) {

            final int userId = mUserTracker.getUserId();

            final int strongAuthFlags = mStrongAuthTracker.getStrongAuthForUser(userId);

            BiometricAuthenticated fingerprint = mUserFingerprintAuthenticated.get(userId);

            pw.println("  Fingerprint state (user=" + userId + ")");

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

            pw.println("    areAllFpAuthenticatorsRegistered="

                    + mAuthController.areAllFingerprintAuthenticatorsRegistered());

            pw.println("    allowed="
@@ -4184,11 +4205,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    mFingerprintListenBuffer.toList()

            ).printTableData(pw);

        }

        if (mFaceManager != null && !mFaceSensorProperties.isEmpty()) {

        if (isFaceSupported()) {

            final int userId = mUserTracker.getUserId();

            final int strongAuthFlags = mStrongAuthTracker.getStrongAuthForUser(userId);

            BiometricAuthenticated face = mUserFaceAuthenticated.get(userId);

            pw.println("  Face authentication state (user=" + userId + ")");

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

            pw.println("    allowed="

                    + (face != null && isUnlockingWithBiometricAllowed(face.mIsStrongBiometric)));

            pw.println("    auth'd="

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+17 −25
Original line number Diff line number Diff line
@@ -1127,13 +1127,7 @@ public class KeyguardIndicationController { 
            final boolean faceAuthUnavailable = biometricSourceType == FACE

                    && msgId == BIOMETRIC_HELP_FACE_NOT_AVAILABLE;



            // TODO(b/141025588): refactor to reduce repetition of code/comments

            // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong

            // as long as primary auth, i.e. PIN/pattern/password, is not required), so it's ok to

            // pass true for isStrongBiometric to isUnlockingWithBiometricAllowed() to bypass the

            // check of whether non-strong biometric is allowed

            if (!mKeyguardUpdateMonitor

                    .isUnlockingWithBiometricAllowed(true /* isStrongBiometric */)

            if (isPrimaryAuthRequired()

                    && !faceAuthUnavailable) {

                return;

            }
@@ -1234,7 +1228,7 @@ public class KeyguardIndicationController { 
        private void onFaceAuthError(int msgId, String errString) {

            CharSequence deferredFaceMessage = mFaceAcquiredMessageDeferral.getDeferredMessage();

            mFaceAcquiredMessageDeferral.reset();

            if (shouldSuppressFaceError(msgId, mKeyguardUpdateMonitor)) {

            if (shouldSuppressFaceError(msgId)) {

                mKeyguardLogger.logBiometricMessage("suppressingFaceError", msgId, errString);

                return;

            }
@@ -1248,7 +1242,7 @@ public class KeyguardIndicationController { 
        }



        private void onFingerprintAuthError(int msgId, String errString) {

            if (shouldSuppressFingerprintError(msgId, mKeyguardUpdateMonitor)) {

            if (shouldSuppressFingerprintError(msgId)) {

                mKeyguardLogger.logBiometricMessage("suppressingFingerprintError",

                        msgId,

                        errString);
@@ -1257,31 +1251,19 @@ public class KeyguardIndicationController { 
            }

        }



        private boolean shouldSuppressFingerprintError(int msgId,

                KeyguardUpdateMonitor updateMonitor) {

            // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong

            // as long as primary auth, i.e. PIN/pattern/password, is not required), so it's ok to

            // pass true for isStrongBiometric to isUnlockingWithBiometricAllowed() to bypass the

            // check of whether non-strong biometric is allowed

            return ((!updateMonitor.isUnlockingWithBiometricAllowed(true /* isStrongBiometric */)

                    && !isLockoutError(msgId))

        private boolean shouldSuppressFingerprintError(int msgId) {

            return ((isPrimaryAuthRequired() && !isLockoutError(msgId))

                    || msgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED

                    || msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED

                    || msgId == FingerprintManager.BIOMETRIC_ERROR_POWER_PRESSED);

        }



        private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) {

            // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong

            // as long as primary auth, i.e. PIN/pattern/password, is not required), so it's ok to

            // pass true for isStrongBiometric to isUnlockingWithBiometricAllowed() to bypass the

            // check of whether non-strong biometric is allowed

            return ((!updateMonitor.isUnlockingWithBiometricAllowed(true /* isStrongBiometric */)

                    && msgId != FaceManager.FACE_ERROR_LOCKOUT_PERMANENT)

        private boolean shouldSuppressFaceError(int msgId) {

            return ((isPrimaryAuthRequired() && msgId != FaceManager.FACE_ERROR_LOCKOUT_PERMANENT)

                    || msgId == FaceManager.FACE_ERROR_CANCELED

                    || msgId == FaceManager.FACE_ERROR_UNABLE_TO_PROCESS);

        }





        @Override

        public void onTrustChanged(int userId) {

            if (!isCurrentUser(userId)) return;
@@ -1355,6 +1337,16 @@ public class KeyguardIndicationController { 
        }

    }



    private boolean isPrimaryAuthRequired() {

        // Only checking if unlocking with Biometric is allowed (no matter strong or non-strong

        // as long as primary auth, i.e. PIN/pattern/password, is required), so it's ok to

        // pass true for isStrongBiometric to isUnlockingWithBiometricAllowed() to bypass the

        // check of whether non-strong biometric is allowed since strong biometrics can still be

        // used.

        return !mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(

                true /* isStrongBiometric */);

    }



    protected boolean isPluggedInAndCharging() {

        return mPowerPluggedIn;

    }

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardUnlockAnimationController;



import dagger.Lazy;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Objects;



import javax.inject.Inject;



import dagger.Lazy;



/**

 */

@SysUISingleton

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

+165 −94

File changed.

Preview size limit exceeded, changes collapsed.