resolved conflicts for merge of 9034ce54 to master
Change-Id: I427f8cfeca25c1ca65b231ded89d2e675007e1b4
diff --git a/include/hardware/fingerprint.h b/include/hardware/fingerprint.h
index c8d59cd..a1b81ae 100644
--- a/include/hardware/fingerprint.h
+++ b/include/hardware/fingerprint.h
@@ -177,20 +177,22 @@
int (*cancel)(struct fingerprint_device *dev);
/*
- * Enumerate all fingerprint templates known to the system.
+ * Enumerate all the fingerprint templates found in the directory set by
+ * set_active_group()
* This is a synchronous call. The function takes:
* - A pointer to an array of fingerprint_finger_id_t.
* - The size of the array provided, in fingerprint_finger_id_t elements.
* Max_size is a bi-directional parameter and returns the actual number
* of elements copied to the caller supplied array.
- * The function always returns the total number of templates in the system unless
- * there is an error.
+ * In the absence of errors the function returns the total number of templates
+ * in the user directory.
* If the caller has no good guess on the size of the array he should call this
- * function witn *max_size == 0 and use the return value for array allocation.
+ * function witn *max_size == 0 and use the return value for the array allocation.
* The caller of this function has a complete list of the templates when *max_size
* is the same as the function return.
*
- * Function return: Total number of fingerprint templates known to the system.
+ * Function return: Total number of fingerprint templates in the current
+ storage directory.
* -1 on error.
*/
int (*enumerate)(struct fingerprint_device *dev, fingerprint_finger_id_t *results,