tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge cherrypicks of [3653390, 3653430, 3652255, 3652256, 3652257, 3653371, 3652400, 3653391, 3653372, 3652972, 3653411, 3653412, 3653413] into pi-release

Browse source 
Change-Id: Ibd5d1748b46b73a0e635f6a808186d78b3ed10f4
This commit is contained in:
android-build-team Robot 2018-02-23 18:03:55 +00:00
commit c69e6f23db
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/hardware/keymaster_defs.h
View file

@ -112,8 +112,6 @@ typedef enum {
KM_TAG_ALLOW_WHILE_ON_BODY = KM_BOOL | 506, /* Allow key to be used after authentication timeout 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 * if device is still on-body (requires secure
* on-body sensor. */ * 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 */ /* Application access control */
KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* Specified to indicate key is usable by all 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_KEYMASTER_NOT_CONFIGURED = -64,
KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65, KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65,
KM_ERROR_CANNOT_ATTEST_IDS = -66, KM_ERROR_CANNOT_ATTEST_IDS = -66,
KM_ERROR_DEVICE_LOCKED = -71,
KM_ERROR_UNIMPLEMENTED = -100, KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101, KM_ERROR_VERSION_MISMATCH = -101,