commit 437516ea3a4f8484dba96594ba1161d8ff804b91
author Jeff Pu <jeffpu@google.com> Wed Jun 28 15:21:21 2023 +0000
committer Jeff Pu <jeffpu@google.com> Wed Jun 28 15:22:44 2023 +0000
tree 4e7cebf0a2c6f2492fb59a8eee61da9d8a73e2c6
parent fd1e1e58fcf87afcc5e4b0553e3b3eec7197bb37

Inform framework of lockout right when the failed attempts reaches threshold

Bug: b/277780293
Test: atest FakeLockoutTrackerTest
Change-Id: Iefe88f3ab492773844b18c525ddbf37218227256

biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp

diff --git a/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp b/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
index b496a6a..5f5455a 100644
--- a/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
+++ b/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
@@ -195,16 +195,7 @@
     }
 
     // got lockout?
-    FakeLockoutTracker::LockoutMode lockoutMode = mLockoutTracker.getMode();
-    if (lockoutMode == FakeLockoutTracker::LockoutMode::kPermanent) {
-        LOG(ERROR) << "Fail: lockout permanent";
-        cb->onLockoutPermanent();
-        return;
-    } else if (lockoutMode == FakeLockoutTracker::LockoutMode::kTimed) {
-        int64_t timeLeft = mLockoutTracker.getLockoutTimeLeft();
-        LOG(ERROR) << "Fail: lockout timed " << timeLeft;
-        cb->onLockoutTimed(timeLeft);
-    }
+    if (checkSensorLockout(cb)) return;
 
     int i = 0;
     do {
@@ -256,6 +247,7 @@
         LOG(ERROR) << "Fail: fingerprint not enrolled";
         cb->onAuthenticationFailed();
         mLockoutTracker.addFailedAttempt();
+        checkSensorLockout(cb);
     }
 }
 
@@ -563,4 +555,18 @@
     return dist(mRandom);
 }
 
+bool FakeFingerprintEngine::checkSensorLockout(ISessionCallback* cb) {
+    FakeLockoutTracker::LockoutMode lockoutMode = mLockoutTracker.getMode();
+    if (lockoutMode == FakeLockoutTracker::LockoutMode::kPermanent) {
+        LOG(ERROR) << "Fail: lockout permanent";
+        cb->onLockoutPermanent();
+        return true;
+    } else if (lockoutMode == FakeLockoutTracker::LockoutMode::kTimed) {
+        int64_t timeLeft = mLockoutTracker.getLockoutTimeLeft();
+        LOG(ERROR) << "Fail: lockout timed " << timeLeft;
+        cb->onLockoutTimed(timeLeft);
+        return true;
+    }
+    return false;
+}
 }  // namespace aidl::android::hardware::biometrics::fingerprint