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

Commit 54619b5c authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev am: 5dca7729 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13792643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3db63522f291968c5ebb169d81f0b584c016f5eb
parents 9ddae005 5dca7729

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+4 −1
Original line number Diff line number Diff line
@@ -230,7 +230,10 @@ public class FingerprintSettings extends SubSettings { 
        protected void handleError(int errMsgId, CharSequence msg) {

            switch (errMsgId) {

                case FingerprintManager.FINGERPRINT_ERROR_CANCELED:

                    return; // Only happens if we get preempted by another activity. Ignored.

                case FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED:

                    // Only happens if we get preempted by another activity, or canceled by the

                    // user (e.g. swipe up to home). Ignored.

                    return;

                case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT:

                    mInFingerprintLockout = true;

                    // We've been locked out.  Reset after 30s.