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

Commit aa35b8fc authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Do not re-start fingerprint auth if ERROR_USER_CANCELED 

Fixes: 178403701
Test: Enter fingerprint settings, swipe up
Change-Id: I0762405f01d5dfd710ad8b4c4b0e8d4a2bd13b2e
parent 74d540f8

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.