commit a2e1109653a3af7b5f8e79304f0b478f77f92772
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 08 01:50:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 08 01:50:13 2020 +0000
tree 01a3e5a3e54e11c33f83b147b355c5ae1fd73de0
parent 594d10046473f5fae33e3d5f55d105d2a0523e93
parent a8c23bc91e5f6634648c9cfdddd45b326e931d51

Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: a8c23bc91e

Change-Id: I09a06d569ae7983a92fdeae12dd784d1f399dd60

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index d92ce00..eca484c 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -75,8 +75,6 @@
     /* 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 @@
     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,