PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev

Browse Source
This commit is contained in:
Kevin Chyn
2021-03-09 02:26:15 +00:00
committed by Android (Google) Code Review
parent 8bfbd34662 aa35b8fcab
commit 5dca77291b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -230,7 +230,10 @@ public class FingerprintSettings extends SubSettings {
protected void handleError(int errMsgId, CharSequence msg) { protected void handleError(int errMsgId, CharSequence msg) {
switch (errMsgId) { switch (errMsgId) {
case FingerprintManager.FINGERPRINT_ERROR_CANCELED: 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: case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT:
mInFingerprintLockout = true; mInFingerprintLockout = true;
// We've been locked out. Reset after 30s. // We've been locked out. Reset after 30s.