diff options
| author | Brian Young <bcyoung@google.com> | 2018-01-29 23:59:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-30 21:10:28 +0000 |
| commit | 9d18fd1f52500c284864105634802ceebb25ace2 (patch) | |
| tree | c6c52a8aa04d6f405b12a86e311741d1c6a696cc | |
| parent | a2181d40071253ecf5c3679f7d8f84b9867cfd03 (diff) | |
| download | libhardware-9d18fd1f52500c284864105634802ceebb25ace2.tar.gz | |
Revert "Add "Unlocked device required" parameter to keys"
This reverts commit dc9505de44c70e701cdf27c7f7d8d9de5217f4b6.
Reason for revert: Build breakages on elfin, gce_x86_phone.
Bug: 72679761
Bug: 67752510
Change-Id: I53d396632b7a23141b755e028342accf6625ca0b
(cherry picked from commit 680068e9f224b9f82ab85034ca16a14395799e0b)
| -rw-r--r-- | include/hardware/keymaster_defs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 25a4faac..6e812f29 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -112,8 +112,6 @@ 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 @@ -454,7 +452,6 @@ 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, |