commit 9fcf6b1f4924974d1dd65e4a125632c71cfddf51
author Ilya Matyukhin <ilyamaty@google.com> Wed Apr 14 13:43:06 2021 -0700
committer Ilya Matyukhin <ilyamaty@google.com> Wed Apr 14 14:03:27 2021 -0700
tree a478081881bce75ff92bb1a59cd9b9a1b184c959
parent d71e2e03fb24f1775a6e37173320bb3bc3861bac

Update IFace getFeatures/setFeature and feature names

Bug: 185398301
Bug: 185384721
Test: build for aosp_cf_x86_phone-userdebug
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: I75d328485550ccbc4d136d6c6fbea92c21d7e421

biometrics/face/aidl/default/Session.cpp

diff --git a/biometrics/face/aidl/default/Session.cpp b/biometrics/face/aidl/default/Session.cpp
index b5eb717..4438d35 100644
--- a/biometrics/face/aidl/default/Session.cpp
+++ b/biometrics/face/aidl/default/Session.cpp
@@ -92,14 +92,13 @@
     return ndk::ScopedAStatus::ok();
 }
 
-ndk::ScopedAStatus Session::getFeatures(int32_t /*enrollmentId*/) {
+ndk::ScopedAStatus Session::getFeatures() {
     LOG(INFO) << "getFeatures";
     return ndk::ScopedAStatus::ok();
 }
 
 ndk::ScopedAStatus Session::setFeature(const keymaster::HardwareAuthToken& /*hat*/,
-                                       int32_t /*enrollmentId*/, Feature /*feature*/,
-                                       bool /*enabled*/) {
+                                       Feature /*feature*/, bool /*enabled*/) {
     LOG(INFO) << "setFeature";
     return ndk::ScopedAStatus::ok();
 }

biometrics/face/aidl/default/Session.h

diff --git a/biometrics/face/aidl/default/Session.h b/biometrics/face/aidl/default/Session.h
index 73cdf08..c89985e 100644
--- a/biometrics/face/aidl/default/Session.h
+++ b/biometrics/face/aidl/default/Session.h
@@ -50,10 +50,10 @@
 
     ndk::ScopedAStatus removeEnrollments(const std::vector<int32_t>& enrollmentIds) override;
 
-    ndk::ScopedAStatus getFeatures(int32_t enrollmentId) override;
+    ndk::ScopedAStatus getFeatures() override;
 
-    ndk::ScopedAStatus setFeature(const keymaster::HardwareAuthToken& hat, int32_t enrollmentId,
-                                  Feature feature, bool enabled) override;
+    ndk::ScopedAStatus setFeature(const keymaster::HardwareAuthToken& hat, Feature feature,
+                                  bool enabled) override;
 
     ndk::ScopedAStatus getAuthenticatorId() override;