Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adds two missing Keymaster definitions." am: 6d7e4c43d6 am: faefa76349

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505232

Change-Id: If90b06d2c29010322a9949f6e206f23c08c46b22
This commit is contained in:
Bram Bonné
2020-11-23 14:24:42 +00:00
committed by Automerger Merge Worker
parent 5d69e8ed59 faefa76349
commit d914fc3925
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/security/keymaster/KeymasterDefs.java
View File

@@ -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;