fingerprint: Simplify enumeration code

Change-Id: I882f782ae5ea57b46067a4048028cf785970a5ed

1 files changed, 11 insertions, 21 deletions

diff --git a/biometrics/fingerprint/BiometricsFingerprint.cpp b/biometrics/fingerprint/BiometricsFingerprint.cpp
index a83839f..cad25a0 100644
--- a/biometrics/fingerprint/BiometricsFingerprint.cpp
+++ b/biometrics/fingerprint/BiometricsFingerprint.cpp
@@ -186,21 +186,20 @@ Return<RequestStatus> BiometricsFingerprint::enumerate()  {
     uint32_t n = MAX_FINGERPRINTS;
     enumerate_2_0 enumerate = (enumerate_2_0) mDevice->enumerate;
     int ret = enumerate(mDevice, results, &n);
-    Return<RequestStatus> rv = ErrorFilter(ret);
 
-    if (ret == 0) {
-        uint32_t i;
-        fingerprint_msg_t msg;
-
-        msg.type = FINGERPRINT_TEMPLATE_ENUMERATING;
-        for (i = 0; i < n; i++) {
-            msg.data.enumerated.finger = results[i];
-            msg.data.enumerated.remaining_templates = n - i - 1;
-            mDevice->notify(&msg);
+    if (ret == 0 && mClientCallback != nullptr) {
+        ALOGD("Got %d enumerated templates", n);
+        for (uint32_t i = 0; i < n; i++) {
+            const uint64_t devId = reinterpret_cast<uint64_t>(mDevice);
+            const auto& fp = results[i];
+            ALOGD("onEnumerate(fid=%d, gid=%d)", fp.fid, fp.gid);
+            if (!mClientCallback->onEnumerate(devId, fp.fid, fp.gid, n - i - 1).isOk()) {
+                ALOGE("failed to invoke fingerprint onEnumerate callback");
+            }
         }
     }
 
-    return rv;
+    return ErrorFilter(ret);
 }
 
 Return<RequestStatus> BiometricsFingerprint::remove(uint32_t gid, uint32_t fid) {
@@ -357,16 +356,7 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t *msg) {
             }
             break;
         case FINGERPRINT_TEMPLATE_ENUMERATING:
-            ALOGD("onEnumerate(fid=%d, gid=%d, rem=%d)",
-                msg->data.enumerated.finger.fid,
-                msg->data.enumerated.finger.gid,
-                msg->data.enumerated.remaining_templates);
-            if (!thisPtr->mClientCallback->onEnumerate(devId,
-                    msg->data.enumerated.finger.fid,
-                    msg->data.enumerated.finger.gid,
-                    msg->data.enumerated.remaining_templates).isOk()) {
-                ALOGE("failed to invoke fingerprint onEnumerate callback");
-            }
+            // ignored, won't happen for 2.0 HALs
             break;
     }
 }