diff options
| author | Brian Young <bcyoung@google.com> | 2018-02-16 01:18:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-16 01:18:53 +0000 |
| commit | 0dcaf0aebe2d86dcacc9affa0490d29c3f13ebf2 (patch) | |
| tree | 524a72c1e0633eb00b7d3073be6a78bb67655151 | |
| parent | 58f255a32b57bca1e8eeacab894be397201ef172 (diff) | |
| parent | a684cb6c2cee0835065b123e4bb698487de26939 (diff) | |
| download | libhardware-0dcaf0aebe2d86dcacc9affa0490d29c3f13ebf2.tar.gz | |
Merge "Restore "Add "Unlocked device required" parameter to keys""
| -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, |