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

Commit 40aa279d authored by Eran Messeri's avatar Eran Messeri Committed by Android (Google) Code Review
Browse files

Merge "Remove ASSOCIATED_DATA tag" into sc-dev

parents c09eeb3a 71d57d97

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

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ public final class KeymasterDefs { 
    public static final int KM_TAG_DEVICE_UNIQUE_ATTESTATION =

            Tag.DEVICE_UNIQUE_ATTESTATION; // KM_BOOL | 720;



    public static final int KM_TAG_ASSOCIATED_DATA = Tag.ASSOCIATED_DATA; // KM_BYTES | 1000;

    public static final int KM_TAG_NONCE = Tag.NONCE; // KM_BYTES | 1001;

    public static final int KM_TAG_MAC_LENGTH = Tag.MAC_LENGTH; // KM_UINT | 1003;

    public static final int KM_TAG_RESET_SINCE_ID_ROTATION =