Merge "Restart fingerprint auth on cancel." into main

This commit is contained in:
Joshua Mccloskey
2024-04-30 20:51:44 +00:00
committed by Android (Google) Code Review
2 changed files with 29 additions and 6 deletions

View File

@@ -352,11 +352,6 @@ public class FingerprintSettings extends SubSettings {
*/
protected void handleError(int errMsgId, CharSequence msg) {
switch (errMsgId) {
case FingerprintManager.FINGERPRINT_ERROR_CANCELED:
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.