commit 26b20b9f64c3a75c365a7124611b1bdab453e8af
author Ilya Matyukhin <ilyamaty@google.com> Fri Jan 22 11:39:49 2021 -0800
committer Ilya Matyukhin <ilyamaty@google.com> Sat Jan 23 17:53:15 2021 -0800
tree 5ae70a14cf59405a6c8b459a73a79158038d013f
parent 666dc38de4c58c996d872727f90bf213c86919d4

Update the default implementation

Bug: 172593978
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: Ic86c936df8513a6181134053c20fe145cf509f13

biometrics/face/aidl/default/Session.cpp

diff --git a/biometrics/face/aidl/default/Session.cpp b/biometrics/face/aidl/default/Session.cpp
index df51879..63d1721 100644
--- a/biometrics/face/aidl/default/Session.cpp
+++ b/biometrics/face/aidl/default/Session.cpp
@@ -55,8 +55,9 @@
 }
 
 ndk::ScopedAStatus Session::enroll(
-        int32_t /*cookie*/, biometrics::face::EnrollmentType /*enrollmentType*/,
-        const keymaster::HardwareAuthToken& /*hat*/, const NativeHandle& /*previewSurface*/,
+        int32_t /*cookie*/, const keymaster::HardwareAuthToken& /*hat*/,
+        EnrollmentType /*enrollmentType*/, const std::vector<Feature>& /*features*/,
+        const NativeHandle& /*previewSurface*/,
         std::shared_ptr<biometrics::common::ICancellationSignal>* /*return_val*/) {
     return ndk::ScopedAStatus::ok();
 }
@@ -94,6 +95,17 @@
     return ndk::ScopedAStatus::ok();
 }
 
+ndk::ScopedAStatus Session::getFeatures(int32_t /*cookie*/, int32_t /*enrollmentId*/) {
+    return ndk::ScopedAStatus::ok();
+}
+
+ndk::ScopedAStatus Session::setFeature(int32_t /*cookie*/,
+                                       const keymaster::HardwareAuthToken& /*hat*/,
+                                       int32_t /*enrollmentId*/, Feature /*feature*/,
+                                       bool /*enabled*/) {
+    return ndk::ScopedAStatus::ok();
+}
+
 ndk::ScopedAStatus Session::getAuthenticatorId(int32_t /*cookie*/) {
     if (cb_) {
         cb_->onStateChanged(0, SessionState::GETTING_AUTHENTICATOR_ID);

biometrics/face/aidl/default/Session.h

diff --git a/biometrics/face/aidl/default/Session.h b/biometrics/face/aidl/default/Session.h
index 347d202..83cb064 100644
--- a/biometrics/face/aidl/default/Session.h
+++ b/biometrics/face/aidl/default/Session.h
@@ -34,10 +34,10 @@
 
     ndk::ScopedAStatus revokeChallenge(int32_t cookie, int64_t challenge) override;
 
-    ndk::ScopedAStatus enroll(
-            int32_t cookie, biometrics::face::EnrollmentType enrollmentType,
-            const keymaster::HardwareAuthToken& hat, const NativeHandle& previewSurface,
-            std::shared_ptr<biometrics::common::ICancellationSignal>* return_val) override;
+    ndk::ScopedAStatus enroll(int32_t cookie, const keymaster::HardwareAuthToken& hat,
+                              EnrollmentType enrollmentType, const std::vector<Feature>& features,
+                              const NativeHandle& previewSurface,
+                              std::shared_ptr<common::ICancellationSignal>* return_val) override;
 
     ndk::ScopedAStatus authenticate(
             int32_t cookie, int64_t keystoreOperationId,
@@ -51,6 +51,11 @@
     ndk::ScopedAStatus removeEnrollments(int32_t cookie,
                                          const std::vector<int32_t>& enrollmentIds) override;
 
+    ndk::ScopedAStatus getFeatures(int32_t cookie, int32_t enrollmentId) override;
+
+    ndk::ScopedAStatus setFeature(int32_t cookie, const keymaster::HardwareAuthToken& hat,
+                                  int32_t enrollmentId, Feature feature, bool enabled) override;
+
     ndk::ScopedAStatus getAuthenticatorId(int32_t cookie) override;
 
     ndk::ScopedAStatus invalidateAuthenticatorId(int32_t cookie) override;