commit 3bc1f0667f38b8bd188a715dfdcf5d9e541ec707
author Jeff Pu <jeffpu@google.com> Fri Apr 19 19:37:45 2024 +0000
committer Jeff Pu <jeffpu@google.com> Mon Apr 29 16:50:48 2024 +0000
tree a6112b599347518f1a63cfdfe33f3096cd0e3a8d
parent 66fcc18bd9e8d2422db0e1b9d8c325872b8e15ce

Added more methods in IVirtualHal interface

Bug: 326227403
Test: atest android.hardware.biometrics.fingerprint.* -c
Change-Id: If5cdd5e5cfea96ef941852ea286f865a99ef8ba8

biometrics/fingerprint/aidl/default/include/VirtualHal.h

diff --git a/biometrics/fingerprint/aidl/default/include/VirtualHal.h b/biometrics/fingerprint/aidl/default/include/VirtualHal.h
index 6cc4b66..e5f62fc 100644
--- a/biometrics/fingerprint/aidl/default/include/VirtualHal.h
+++ b/biometrics/fingerprint/aidl/default/include/VirtualHal.h
@@ -28,6 +28,9 @@
 
     ::ndk::ScopedAStatus setEnrollments(const std::vector<int32_t>& in_id) override;
     ::ndk::ScopedAStatus setEnrollmentHit(int32_t in_hit_id) override;
+    ::ndk::ScopedAStatus setNextEnrollment(
+            const ::aidl::android::hardware::biometrics::fingerprint::NextEnrollment&
+                    in_next_enrollment) override;
     ::ndk::ScopedAStatus setAuthenticatorId(int64_t in_id) override;
     ::ndk::ScopedAStatus setChallenge(int64_t in_challenge) override;
     ::ndk::ScopedAStatus setOperationAuthenticateFails(bool in_fail) override;
@@ -36,7 +39,7 @@
     ::ndk::ScopedAStatus setOperationAuthenticateDuration(int32_t in_duration) override;
     ::ndk::ScopedAStatus setOperationAuthenticateError(int32_t in_error) override;
     ::ndk::ScopedAStatus setOperationAuthenticateAcquired(
-            const std::vector<int32_t>& in_acquired) override;
+            const std::vector<AcquiredInfoAndVendorCode>& in_acquired) override;
     ::ndk::ScopedAStatus setOperationEnrollError(int32_t in_error) override;
     ::ndk::ScopedAStatus setOperationEnrollLatency(const std::vector<int32_t>& in_latency) override;
     ::ndk::ScopedAStatus setOperationDetectInteractionLatency(
@@ -44,12 +47,13 @@
     ::ndk::ScopedAStatus setOperationDetectInteractionError(int32_t in_error) override;
     ::ndk::ScopedAStatus setOperationDetectInteractionDuration(int32_t in_duration) override;
     ::ndk::ScopedAStatus setOperationDetectInteractionAcquired(
-            const std::vector<int32_t>& in_acquired) override;
+            const std::vector<AcquiredInfoAndVendorCode>& in_acquired) override;
     ::ndk::ScopedAStatus setLockout(bool in_lockout) override;
     ::ndk::ScopedAStatus setLockoutEnable(bool in_enable) override;
     ::ndk::ScopedAStatus setLockoutTimedThreshold(int32_t in_threshold) override;
     ::ndk::ScopedAStatus setLockoutTimedDuration(int32_t in_duration) override;
     ::ndk::ScopedAStatus setLockoutPermanentThreshold(int32_t in_threshold) override;
+    ::ndk::ScopedAStatus resetConfigurations() override;
     ::ndk::ScopedAStatus setType(
             ::aidl::android::hardware::biometrics::fingerprint::FingerprintSensorType in_type)
             override;
@@ -66,6 +70,7 @@
 
   private:
     OptIntVec intVec2OptIntVec(const std::vector<int32_t>& intVec);
+    OptIntVec acquiredInfoVec2OptIntVec(const std::vector<AcquiredInfoAndVendorCode>& intVec);
     ::ndk::ScopedAStatus sanityCheckLatency(const std::vector<int32_t>& in_latency);
     Fingerprint* mFp;
 };