diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-04 03:17:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-04 03:17:04 +0000 |
| commit | 6ae9a1248d88a480e0c3ebb332ae653c3a4aeed0 (patch) | |
| tree | 0e2813e595dcc040c0af269516e333c3c81ca710 | |
| parent | a73b147efb3bc2c804a55ce8d1e183ad5ea2d40d (diff) | |
| parent | f9539ce315082b3c756213153eb8b6ad991e5977 (diff) | |
| download | libhardware-6ae9a1248d88a480e0c3ebb332ae653c3a4aeed0.tar.gz | |
Snap for 5434517 from f9539ce315082b3c756213153eb8b6ad991e5977 to qt-release
Change-Id: I4640e9bccc61e9bc5c0348326f3411f0adf33cb8
| -rw-r--r-- | include/hardware/keymaster_defs.h | 5 |
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, |