diff options
| author | Bram Bonné <brambonne@google.com> | 2020-11-23 13:49:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-23 13:49:11 +0000 |
| commit | faefa7634936f393c71aa1b65bc454269bb63448 (patch) | |
| tree | e5ef9fdb5a68717dfe36bb98a2d139013751ba75 /core/java | |
| parent | 6975aa858d8e6b6a7b337fbb4ea6d950afcdba91 (diff) | |
| parent | 6d7e4c43d65dc0d880fb1f496de11f3c085918a1 (diff) | |
Merge "Adds two missing Keymaster definitions." am: 6d7e4c43d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505232
Change-Id: Ib17609b0e8a1b40dd412692e70af9fedd2022325
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index e32ffa6e9d05..18921639f55d 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -94,6 +94,8 @@ public final class KeymasterDefs { public static final int KM_TAG_ATTESTATION_ID_MEID = KM_BYTES | 715; public static final int KM_TAG_ATTESTATION_ID_MANUFACTURER = KM_BYTES | 716; public static final int KM_TAG_ATTESTATION_ID_MODEL = KM_BYTES | 717; + public static final int KM_TAG_VENDOR_PATCHLEVEL = KM_UINT | 718; + public static final int KM_TAG_BOOT_PATCHLEVEL = KM_UINT | 719; public static final int KM_TAG_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720; public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000; |