commit 6b9d1244aa8eff8c210e8ff6ea4f620da2497297
author Jim Miller <jaggies@google.com> Thu Sep 03 17:28:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 17:28:34 2015 +0000
tree 4f1c07d839ad2a4963635c99f9c2a76591b99642
parent b4b1000e4711b6375a898503a7ad5d98f5330aab
parent 9f29c39271eb8c23637bf3ff92ae039f35c457d3

am 9f29c392: am ac1da481: am f873f9ab: am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev

* commit '9f29c39271eb8c23637bf3ff92ae039f35c457d3':
  Fingerprint should throttle after 5 attempts

services/core/java/com/android/server/fingerprint/FingerprintService.java

diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index 67c9ee8..0023258 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 @@
     }
 
     private boolean inLockoutMode() {
-        return mFailedAttempts > MAX_FAILED_ATTEMPTS;
+        return mFailedAttempts >= MAX_FAILED_ATTEMPTS;
     }
 
     private void resetFailedAttempts() {
@@ -275,7 +275,7 @@
 
     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);