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 am: 5dca77291b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab03e2d8af40c7ae9adb8d8c4dd862a144b3efa6
This commit is contained in:
Kevin Chyn
2021-03-10 13:13:10 +00:00
committed by Automerger Merge Worker
parent 7e839d0ad3 5dca77291b
commit 6146f860dc
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.