summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Young <bcyoung@google.com>2018-03-30 17:06:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-30 17:06:05 +0000
commit2d744d867c75a16d7fddc545a89321a799f602a6 (patch)
tree0eac37d53b8ebdddc5bc90a8b792ae7521cc37b1
parent75ae7e343b7154418dbc13e64863c27885d999d3 (diff)
parent8cf2862f9410d3b581038edd1575c11e4ced9c76 (diff)
downloadlibhardware-2d744d867c75a16d7fddc545a89321a799f602a6.tar.gz
Add "Unlocked device required" key API
am: 8cf2862f94 Change-Id: Ibe0d9d993337fa05d8b69fe2d580d0f4ab67d083
-rw-r--r--include/hardware/keymaster_defs.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 6e812f29..cec486e7 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -112,6 +112,8 @@ 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
@@ -452,6 +454,7 @@ 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 = -72,
KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101,