Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev

This commit is contained in:
Jim Miller
2015-09-02 23:07:58 +00:00
committed by Android (Google) Code Review

View File

@@ -259,7 +259,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
} }
private boolean inLockoutMode() { private boolean inLockoutMode() {
return mFailedAttempts > MAX_FAILED_ATTEMPTS; return mFailedAttempts >= MAX_FAILED_ATTEMPTS;
} }
private void resetFailedAttempts() { private void resetFailedAttempts() {
@@ -275,7 +275,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
private boolean handleFailedAttempt(ClientMonitor clientMonitor) { private boolean handleFailedAttempt(ClientMonitor clientMonitor) {
mFailedAttempts++; mFailedAttempts++;
if (mFailedAttempts > MAX_FAILED_ATTEMPTS) { if (inLockoutMode()) {
// Failing multiple times will continue to push out the lockout time. // Failing multiple times will continue to push out the lockout time.
mHandler.removeCallbacks(mLockoutReset); mHandler.removeCallbacks(mLockoutReset);
mHandler.postDelayed(mLockoutReset, FAIL_LOCKOUT_TIMEOUT_MS); mHandler.postDelayed(mLockoutReset, FAIL_LOCKOUT_TIMEOUT_MS);