Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faefa763 authored by Bram Bonné's avatar Bram Bonné Committed by Automerger Merge Worker
Browse files

Merge "Adds two missing Keymaster definitions." am: 6d7e4c43 

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

Change-Id: Ib17609b0e8a1b40dd412692e70af9fedd2022325
parents 6975aa85 6d7e4c43

core/java/android/security/keymaster/KeymasterDefs.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -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_MEID = KM_BYTES | 715;

    public static final int KM_TAG_ATTESTATION_ID_MANUFACTURER = KM_BYTES | 716;

    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_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_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720;





    public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000;

    public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000;