Address HIDL review comments
Fixes: 127852175
Test: builds
Test: hidl-gen -L hash -r android.hardware:hardware/interfaces android.hardware.biometrics.face@1.0
hash added to current.txt
Test: make -j56 VtsHalBiometricsFaceV1_0TargetTest
Change-Id: I4a8b6db5824a686ec742ed826ff26e721ff26dc8
diff --git a/biometrics/face/1.0/IBiometricsFace.hal b/biometrics/face/1.0/IBiometricsFace.hal
index cd368fa..180d829 100644
--- a/biometrics/face/1.0/IBiometricsFace.hal
+++ b/biometrics/face/1.0/IBiometricsFace.hal
@@ -59,7 +59,9 @@
*
* @param userId A non-negative user identifier that must be unique and
* persistent for a given user.
- * @param storePath filesystem path to the template storage directory.
+ * @param storePath absolute filesystem path to the template storage
+ * directory. This must be the /data/vendor_de/<user>/facedata
+ * directory specified by the SeLinux policy.
*/
@callflow(next={"authenticate", "generateChallenge", "enumerate", "remove"})
setActiveUser(int32_t userId, string storePath) generates (Status status);
@@ -159,8 +161,8 @@
* @param enabled True to enable the feature, false to disable.
* @param hat A valid Hardware Authentication Token, generated as a result
* of getChallenge().
- * @param faceId the ID of the enrollment returned by enroll() for the
- * feature to update.
+ * @param faceId the ID of the enrollment returned by onEnrollResult() for
+ * the feature to update.
* @return status The status of this method call.
*/
setFeature(Feature feature, bool enabled, vec<uint8_t> hat, uint32_t faceId)
diff --git a/biometrics/face/1.0/IBiometricsFaceClientCallback.hal b/biometrics/face/1.0/IBiometricsFaceClientCallback.hal
index 969bc68..d7c317d 100644
--- a/biometrics/face/1.0/IBiometricsFaceClientCallback.hal
+++ b/biometrics/face/1.0/IBiometricsFaceClientCallback.hal
@@ -95,13 +95,10 @@
*
* @param deviceId A unique id associated with the HAL implementation
* service that processed this removal.
- * @param faceId The id of the face template that was removed.
+ * @param removed A list of ids that were removed.
* @param userId The active user id for the removed face template.
- * @param remaining The number of face templates remaining after this
- * removal, or 0 if there are no more.
*/
- oneway onRemoved(uint64_t deviceId, uint32_t faceId, int32_t userId,
- uint32_t remaining);
+ oneway onRemoved(uint64_t deviceId, vec<uint32_t> removed, int32_t userId);
/**
* A callback invoked to enumerate all current face templates.
diff --git a/biometrics/face/1.0/vts/functional/VtsHalBiometricsFaceV1_0TargetTest.cpp b/biometrics/face/1.0/vts/functional/VtsHalBiometricsFaceV1_0TargetTest.cpp
index 795a1ae..40961f7 100644
--- a/biometrics/face/1.0/vts/functional/VtsHalBiometricsFaceV1_0TargetTest.cpp
+++ b/biometrics/face/1.0/vts/functional/VtsHalBiometricsFaceV1_0TargetTest.cpp
@@ -104,7 +104,7 @@
return Return<void>();
}
- Return<void> onRemoved(uint64_t, uint32_t, int32_t, uint32_t) override {
+ Return<void> onRemoved(uint64_t, const hidl_vec<uint32_t>&, int32_t) override {
ALOGD("Removed callback called.");
return Return<void>();
}
@@ -155,12 +155,9 @@
public:
explicit RemoveCallback(int32_t userId) : removeUserId(userId) {}
- Return<void> onRemoved(uint64_t, uint32_t, int32_t userId, uint32_t remaining) override {
+ Return<void> onRemoved(uint64_t, const hidl_vec<uint32_t>&, int32_t userId) override {
EXPECT_EQ(removeUserId, userId);
promise.set_value();
- if (remaining == 0UL) {
- promise.set_value();
- }
return Return<void>();
}