commit c58c13980109262b47f3149a2d3f302d0a589055
author Matthew Maurer <mmaurer@google.com> Wed Apr 03 10:10:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 10:10:56 2019 -0700
tree 233ec3dba92cefdd9c2137276f2e4d44b3d12e03
parent 95ee514db521ab63c9470758afd602c52ac67e22
parent c559ff39378c795c9ee1588584a6ade9699380c3

Merge "Add KM_TRUSTED_CONFIRMATION_REQUIRED"
am: c559ff3937

Change-Id: I5586f43c01e490727dcda5f01e92b3de638b07ac

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 196062e..eca484c 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -112,7 +112,9 @@
     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 @@
     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,