summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2019-04-03 10:36:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-03 10:36:35 -0700
commit9c5b803a88c762ba3125c8c73a6b5915755b93b8 (patch)
tree233ec3dba92cefdd9c2137276f2e4d44b3d12e03
parent19a36a9e8aaee2ad69465038cb60edcb76ed0686 (diff)
parentc58c13980109262b47f3149a2d3f302d0a589055 (diff)
downloadlibhardware-9c5b803a88c762ba3125c8c73a6b5915755b93b8.tar.gz
Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED" am: c559ff3937
am: c58c139801 Change-Id: I9b23f7d28c99cf368a7d32c6513f3a8091652bb3
-rw-r--r--include/hardware/keymaster_defs.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 196062ee..eca484cd 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -112,7 +112,9 @@ 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
+ KM_TAG_TRUSTED_CONFIRMATION_REQUIRED = KM_BOOL | 508, /* Require user confirmation through a
+ * trusted UI to use this key */
+ KM_TAG_UNLOCKED_DEVICE_REQUIRED = KM_BOOL | 509, /* Require the device screen to be unlocked if the
* key is used. */
/* Application access control */
@@ -454,6 +456,7 @@ typedef enum {
KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64,
KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65,
KM_ERROR_CANNOT_ATTEST_IDS = -66,
+ KM_ERROR_NO_USER_CONFIRMATION = -71,
KM_ERROR_DEVICE_LOCKED = -72,
KM_ERROR_UNIMPLEMENTED = -100,