summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Drysdale <drysdale@google.com> 2021-04-27 17:41:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-27 17:41:13 +0000
commit3a19c2f0fcc33bf57336d990ba7f3be9910bb8cd (patch)
tree2cfa7119adf971ce8405f2f21ff255bf37b14cb4
parentcb2afcb262bd1273e95b1c123a0fbf3feccb8000 (diff)
parenteb393d45f004e9a7140f5a4795580be1f704093a (diff)
Merge "Align KeyMint AIDL with usage" am: 6b8f292b17 am: eb393d45f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682041 Change-Id: I0fac9054cf9432bdac30fe3d4b4934b1dae5c61f
-rw-r--r--core/java/android/security/keymaster/KeymasterDefs.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java
index 5a89cdf1d340..0b11aeb1ed65 100644
--- a/core/java/android/security/keymaster/KeymasterDefs.java
+++ b/core/java/android/security/keymaster/KeymasterDefs.java
@@ -66,9 +66,6 @@ public final class KeymasterDefs {
public static final int KM_TAG_CALLER_NONCE = Tag.CALLER_NONCE; // KM_BOOL | 7;
public static final int KM_TAG_MIN_MAC_LENGTH = Tag.MIN_MAC_LENGTH; // KM_UINT | 8;
- public static final int KM_TAG_BLOB_USAGE_REQUIREMENTS =
- Tag.BLOB_USAGE_REQUIREMENTS; // KM_ENUM | 705;
-
public static final int KM_TAG_RSA_PUBLIC_EXPONENT = Tag.RSA_PUBLIC_EXPONENT; // KM_ULONG | 200;
public static final int KM_TAG_INCLUDE_UNIQUE_ID = Tag.INCLUDE_UNIQUE_ID; // KM_BOOL | 202;