commit 5b81ed5c4d7ec7033f2ca8d04bf52faa71ab1ccc
author Sasha Levitskiy <sanek@google.com> Thu Dec 03 10:52:38 2015 -0800
committer Sasha Levitskiy <sanek@google.com> Thu Dec 03 16:23:28 2015 -0800
tree 59587fe8d1fefd19610bec5613b9c82a96d1599e
parent ea2243eda287d9ecd582e8c293c8abc2c06d3004

Fingerprint: Fix the emulator build with new enumerate()

Bug: 25244240

Change-Id: If337241594b8c52737a14d476c1db96930b62a48
Signed-off-by: Sasha Levitskiy <sanek@google.com>

fingerprint/fingerprint.c

diff --git a/fingerprint/fingerprint.c b/fingerprint/fingerprint.c
index 0ea69ca..a5f2d4f 100644
--- a/fingerprint/fingerprint.c
+++ b/fingerprint/fingerprint.c
@@ -314,27 +314,24 @@
     return 0;
 }
 
-static int fingerprint_enumerate(struct fingerprint_device *device,
-        fingerprint_finger_id_t *results, uint32_t *max_size) {
+static int fingerprint_enumerate(struct fingerprint_device *device) {
     ALOGD("----------------> %s ----------------->", __FUNCTION__);
-    if (device == NULL || results == NULL || max_size == NULL) {
+    if (device == NULL) {
         ALOGE("Cannot enumerate saved fingerprints with uninitialized params");
         return -1;
     }
 
     qemu_fingerprint_device_t* qdev = (qemu_fingerprint_device_t*)device;
     unsigned int i = 0;
-    int num = 0;
     for (i = 0; i < MAX_NUM_FINGERS; i++) {
         if (qdev->listener.secureid[i] != 0 ||
             qdev->listener.authenid[i] != 0) {
             ALOGD("ENUM: Fingerprint [%d] = 0x%" PRIx64 ",%" PRIx64, i,
                   qdev->listener.secureid[i], qdev->listener.authenid[i]);
-            num++;
         }
     }
 
-    return num;
+    return 0;
 }
 
 static int fingerprint_remove(struct fingerprint_device *device,
@@ -717,7 +714,7 @@
     loadFingerprints(&qdev->listener);
 
     qdev->device.common.tag = HARDWARE_DEVICE_TAG;
-    qdev->device.common.version = HARDWARE_MODULE_API_VERSION(2, 0);
+    qdev->device.common.version = HARDWARE_MODULE_API_VERSION(2, 1);
     qdev->device.common.module = (struct hw_module_t*)module;
     qdev->device.common.close = fingerprint_close;
 
@@ -752,7 +749,7 @@
 fingerprint_module_t HAL_MODULE_INFO_SYM = {
     .common = {
         .tag                = HARDWARE_MODULE_TAG,
-        .module_api_version = FINGERPRINT_MODULE_API_VERSION_2_0,
+        .module_api_version = FINGERPRINT_MODULE_API_VERSION_2_1,
         .hal_api_version    = HARDWARE_HAL_API_VERSION,
         .id                 = FINGERPRINT_HARDWARE_MODULE_ID,
         .name               = "Emulator Fingerprint HAL",