diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-30 08:20:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-30 08:20:33 +0000 |
| commit | a2181d40071253ecf5c3679f7d8f84b9867cfd03 (patch) | |
| tree | bc0ae64830044b3c63ae0234e892014268da335c | |
| parent | 5c2772af141500c57cca0c8a5d1b775efd7bcb92 (diff) | |
| parent | 9ef9cf40e2803a576d4f8961434a82e98831211f (diff) | |
| download | libhardware-a2181d40071253ecf5c3679f7d8f84b9867cfd03.tar.gz | |
Snap for 4574286 from 9ef9cf40e2803a576d4f8961434a82e98831211f to pi-release
Change-Id: If9debef5179acb7fdbb43a8c246b9b190f89e4ad
| -rw-r--r-- | include/hardware/keymaster_defs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 6e812f29..25a4faac 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 = -71, KM_ERROR_UNIMPLEMENTED = -100, KM_ERROR_VERSION_MISMATCH = -101, |