From 00d21e3c7502b2a8015cf8dc1c2c7558a2317763 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 20 Jun 2017 14:24:43 -0700 Subject: [PATCH] FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT Fixes: 62681560 Test: open fingerprint settings, use an unenrolled fingerprint to authenticate 20 times in a row. Look at logs and it shouldn't be flooded with fingerprint logs Change-Id: I59051e8d3a9e040bcd894e956abcbf0497838988 --- .../settings/fingerprint/FingerprintSettings.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index a5595f97ad..89c3d78469 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -261,14 +261,18 @@ public class FingerprintSettings extends SubSettings { mHandler.postDelayed(mFingerprintLockoutReset, LOCKOUT_DURATION); } - // Fall through to show message - default: - // Activity can be null on a screen rotation. - final Activity activity = getActivity(); - if (activity != null) { - Toast.makeText(activity, msg , Toast.LENGTH_SHORT); - } - break; + break; + case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT: + mInFingerprintLockout = true; + break; + } + + if (mInFingerprintLockout) { + // Activity can be null on a screen rotation. + final Activity activity = getActivity(); + if (activity != null) { + Toast.makeText(activity, msg , Toast.LENGTH_SHORT).show(); + } } retryFingerprint(); // start again } -- 2.11.0