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

Commit b0b29b24 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Do not start auth if BIOMETRIC_STATE_CANCELLING_RESTARTING" into sc-dev

parents e26932dc 3983c16c

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

+4 −1
Original line number Diff line number Diff line
@@ -2237,8 +2237,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        if (mFaceRunningState == BIOMETRIC_STATE_CANCELLING) {

            setFaceRunningState(BIOMETRIC_STATE_CANCELLING_RESTARTING);

            return;

        } else if (mFaceRunningState == BIOMETRIC_STATE_CANCELLING_RESTARTING) {

            // Waiting for ERROR_CANCELED before requesting auth again

            return;

        }

        if (DEBUG) Log.v(TAG, "startListeningForFace()");

        if (DEBUG) Log.v(TAG, "startListeningForFace(): " + mFaceRunningState);

        int userId = getCurrentUser();

        if (isUnlockWithFacePossible(userId)) {

            if (mFaceCancelSignal != null) {