diff options
| author | Xin Li <delphij@google.com> | 2020-01-15 15:57:12 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-01-15 15:57:12 -0800 |
| commit | ead3ab68fe7be5fedab668cef096737e202d0e44 (patch) | |
| tree | 01a3e5a3e54e11c33f83b147b355c5ae1fd73de0 | |
| parent | e16c3ebe00c1aeeb6289bd8dea11378d7c2cc815 (diff) | |
| parent | cfb9a10ba299c32958c4dd923cd68aabda126274 (diff) | |
| download | libhardware-ead3ab68fe7be5fedab668cef096737e202d0e44.tar.gz | |
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I77a0b3f1ce48814aad684864c750efdd26e90e42
| -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 d92ce007..eca484cd 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -75,8 +75,6 @@ typedef enum { /* Other hardware-enforced. */ KM_TAG_BLOB_USAGE_REQUIREMENTS = KM_ENUM | 301, /* keymaster_key_blob_usage_requirements_t */ KM_TAG_BOOTLOADER_ONLY = KM_BOOL | 302, /* Usable only by bootloader */ - KM_TAG_ROLLBACK_RESISTANCE = KM_BOOL | 303, /* Hardware enforced deletion with deleteKey - * or deleteAllKeys is supported */ /* * Tags that should be semantically enforced by hardware if possible and will otherwise be @@ -458,7 +456,6 @@ typedef enum { KM_ERROR_KEYMASTER_NOT_CONFIGURED = -64, KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING = -65, KM_ERROR_CANNOT_ATTEST_IDS = -66, - KM_ERROR_ROLLBACK_RESISTANCE_UNAVAILABLE = -67, KM_ERROR_NO_USER_CONFIRMATION = -71, KM_ERROR_DEVICE_LOCKED = -72, |