Move lockout callbacks to ISessionCallback
Also fixes backward compatibility for AcquiredInfo and Error
constants.
For lockout-related changes:
1) If a session doesn't exist, it means the framework (or higher)
doesn't care about its lockout state.
2) This allows the ISession#authenticate lifecycle to be clearer,
e.g. no need for ILockoutCallback#onLockoutTimed followed by
ISessionCallback#onError(LOCKOUT)
Bug: 168842956
Bug: 168843220
Test: make -j android.hardware.biometrics.fingerprint-update-api
Test: make -j
Test: make -j VtsHalBiometricsFingerprintTargetTest
Change-Id: I0b7e7ab3b89d0d1d7647535af07766c493a2067b
diff --git a/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp b/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
index 3011786..496badc 100644
--- a/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
+++ b/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
@@ -74,6 +74,18 @@
return ndk::ScopedAStatus::ok();
}
+ ndk::ScopedAStatus onLockoutTimed(int64_t /*durationMillis*/) override {
+ return ndk::ScopedAStatus::ok();
+ }
+
+ ndk::ScopedAStatus onLockoutPermanent() override {
+ return ndk::ScopedAStatus::ok();
+ }
+
+ ndk::ScopedAStatus onLockoutCleared() override {
+ return ndk::ScopedAStatus::ok();
+ }
+
ndk::ScopedAStatus onInteractionDetected() override { return ndk::ScopedAStatus::ok(); }
ndk::ScopedAStatus onEnrollmentsEnumerated(