summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Young <bcyoung@google.com>2018-02-22 23:36:19 +0000
committerBrian Young <bcyoung@google.com>2018-02-23 01:31:34 +0000
commit968f997468f1fcb5c68157a850c8d5c79576c00c (patch)
tree9f29c0a0ef75f68e350b5d0f0a489d199b5d1520
parenta684cb6c2cee0835065b123e4bb698487de26939 (diff)
downloadlibhardware-968f997468f1fcb5c68157a850c8d5c79576c00c.tar.gz
Revert "Restore "Add "Unlocked device required" parameter to keys""
This reverts commit a684cb6c2cee0835065b123e4bb698487de26939. Reason for revert: Regression in creating auth-bound keys Bug: 73773914 Bug: 67752510 Change-Id: Ib215d63efe442916f90065015a57614b097cd74d
-rw-r--r--include/hardware/keymaster_defs.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 25a4faac..6e812f29 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -112,8 +112,6 @@ typedef enum {
KM_TAG_ALLOW_WHILE_ON_BODY = KM_BOOL | 506, /* Allow key to be used after authentication timeout
* if device is still on-body (requires secure
* on-body sensor. */
- KM_TAG_UNLOCKED_DEVICE_REQUIRED = KM_BOOL | 508, /* Require the device screen to be unlocked if the
- * key is used. */
/* Application access control */
KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* Specified to indicate key is usable by all
@@ -454,7 +452,6 @@ typedef enum {
KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64,
KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65,
KM_ERROR_CANNOT_ATTEST_IDS = -66,
- KM_ERROR_DEVICE_LOCKED = -71,
KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101,