summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2016-06-15 02:01:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-15 02:01:44 +0000
commit4a2683f893e938944fc39f66a0f87d429fcc70bf (patch)
tree46664241a1e72ac401d3094a6af9549929769ba5
parent4878b58eb00714b43d4b65cb664bc602b165a4df (diff)
parente453c5212ae0f0de3b2fc16b67f14e6bd06a8ce1 (diff)
downloadlibhardware-4a2683f893e938944fc39f66a0f87d429fcc70bf.tar.gz
Revert \"Fingerprint: Add an API to support throttling.\"
am: e453c5212a Change-Id: Ic925b2038494d20038de1d10454a5de3114d7763
-rw-r--r--include/hardware/fingerprint.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/include/hardware/fingerprint.h b/include/hardware/fingerprint.h
index b5677329..618ca7ea 100644
--- a/include/hardware/fingerprint.h
+++ b/include/hardware/fingerprint.h
@@ -50,7 +50,6 @@ typedef enum fingerprint_error {
FINGERPRINT_ERROR_NO_SPACE = 4, /* No space available to store a template */
FINGERPRINT_ERROR_CANCELED = 5, /* The current operation can't proceed. See above. */
FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6, /* fingerprint with given id can't be removed */
- FINGERPRINT_ERROR_LOCKOUT = 7, /* the functionality is temporarily locked out */
FINGERPRINT_ERROR_VENDOR_BASE = 1000 /* vendor-specific error messages start here */
} fingerprint_error_t;
@@ -251,16 +250,8 @@ typedef struct fingerprint_device {
*/
int (*authenticate)(struct fingerprint_device *dev, uint64_t operation_id, uint32_t gid);
- /*
- * Resets a lockout by providing a valid hardware authentication token.
- *
- * Function return: 0 on success
- * or a negative number in case of error, generally from the errno.h set.
- */
- int (*reset_lockout)(struct fingerprint_device *dev, const hw_auth_token_t *hat);
-
/* Reserved for backward binary compatibility */
- void *reserved[3];
+ void *reserved[4];
} fingerprint_device_t;
typedef struct fingerprint_module {