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

Commit 88ec9792 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "Remove ASSOCIATED_DATA tag" into sc-dev am: 40aa279d am: 8797704f 

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

Change-Id: Id8cf77af90709fae9e38139bb8dc5007d4f9bedb
parents 62ee2bcb 8797704f

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

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

    public static final int KM_TAG_DEVICE_UNIQUE_ATTESTATION =

            Tag.DEVICE_UNIQUE_ATTESTATION; // KM_BOOL | 720;

            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_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_MAC_LENGTH = Tag.MAC_LENGTH; // KM_UINT | 1003;

    public static final int KM_TAG_RESET_SINCE_ID_ROTATION =

    public static final int KM_TAG_RESET_SINCE_ID_ROTATION =