commit 417aa19b1114e32b6f2502e6c373dbe335a5a9f8
author Jeff Pu <jeffpu@google.com> Fri Jul 21 16:34:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 21 16:34:19 2023 +0000
tree 05fe44a108522b0239395781e22362099e778ffa
parent 595664a377b78db02bc1254be2572f9a5344106f
parent 1201ba309e90d7bd2b0de32f4887e9a6f199dd3a

Merge "Authentication state stays on enrollment mismatch" into udc-qpr-dev am: bd8f26ea55 am: 1201ba309e

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24147068

Change-Id: If3cd8c437cc0ff4f6458f4cc034e99d440844503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp

diff --git a/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp b/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
index 9757287..9f9ca96 100644
--- a/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
+++ b/biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp
@@ -258,7 +258,7 @@
         cb->onAuthenticationFailed();
         mLockoutTracker.addFailedAttempt();
         checkSensorLockout(cb);
-        return true;
+        return false;
     }
 }
 

biometrics/fingerprint/aidl/default/tests/FakeFingerprintEngineTest.cpp

diff --git a/biometrics/fingerprint/aidl/default/tests/FakeFingerprintEngineTest.cpp b/biometrics/fingerprint/aidl/default/tests/FakeFingerprintEngineTest.cpp
index e7e8a47..bc235a6 100644
--- a/biometrics/fingerprint/aidl/default/tests/FakeFingerprintEngineTest.cpp
+++ b/biometrics/fingerprint/aidl/default/tests/FakeFingerprintEngineTest.cpp
@@ -269,6 +269,7 @@
     mEngine.authenticateImpl(mCallback.get(), 0, mCancel.get_future());
     mEngine.fingerDownAction();
     ASSERT_TRUE(mCallback->mAuthenticateFailed);
+    ASSERT_EQ(mEngine.getWorkMode(), FakeFingerprintEngine::WorkMode::kAuthenticate);
 }
 
 TEST_F(FakeFingerprintEngineTest, AuthenticateLockout) {