summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2015-09-03 06:23:31 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-03 06:23:31 +0000
commit9f29c39271eb8c23637bf3ff92ae039f35c457d3 (patch)
treeb7712a8d6170de3d9131ca5d32caa20551b2d834
parent256718bc72e38b26c6c6b4e8dee78f80dcd2ae4d (diff)
parentac1da4816b360028eb0185ac984f1ffaa79fdb18 (diff)
am ac1da481: am f873f9ab: am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev
* commit 'ac1da4816b360028eb0185ac984f1ffaa79fdb18': Fingerprint should throttle after 5 attempts
-rw-r--r--services/core/java/com/android/server/fingerprint/FingerprintService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index 67c9ee8cdb13..002325840c63 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -259,7 +259,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
}
private boolean inLockoutMode() {
- return mFailedAttempts > MAX_FAILED_ATTEMPTS;
+ return mFailedAttempts >= MAX_FAILED_ATTEMPTS;
}
private void resetFailedAttempts() {
@@ -275,7 +275,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
private boolean handleFailedAttempt(ClientMonitor clientMonitor) {
mFailedAttempts++;
- if (mFailedAttempts > MAX_FAILED_ATTEMPTS) {
+ if (inLockoutMode()) {
// Failing multiple times will continue to push out the lockout time.
mHandler.removeCallbacks(mLockoutReset);
mHandler.postDelayed(mLockoutReset, FAIL_LOCKOUT_TIMEOUT_MS);