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

Commit 1a02a53c authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "Unhide KeyStoreKeyProperties.Origin.UNKNOWN."

parents 35075a07 ed7a2185

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28469,6 +28469,7 @@ package android.security { 
  public static abstract class KeyStoreKeyProperties.Origin {

    field public static final int GENERATED = 1; // 0x1

    field public static final int IMPORTED = 2; // 0x2

    field public static final int UNKNOWN = 4; // 0x4

  }















  public static abstract class KeyStoreKeyProperties.OriginEnum implements java.lang.annotation.Annotation {

























api/system-current.txt



+1
−0






























Original line number
Diff line number
Diff line








@@ -30472,6 +30472,7 @@ package android.security {













  public static abstract class KeyStoreKeyProperties.Origin {















    field public static final int GENERATED = 1; // 0x1















    field public static final int IMPORTED = 2; // 0x2













    field public static final int UNKNOWN = 4; // 0x4















  }





























  public static abstract class KeyStoreKeyProperties.OriginEnum implements java.lang.annotation.Annotation {

























keystore/java/android/security/KeyStoreKeyProperties.java



+1
−3






























Original line number
Diff line number
Diff line








@@ -217,7 +217,7 @@ public abstract class KeyStoreKeyProperties {













    }































    @Retention(RetentionPolicy.SOURCE)













    @IntDef({Origin.GENERATED, Origin.IMPORTED})













    @IntDef({Origin.GENERATED, Origin.IMPORTED, Origin.UNKNOWN})















    public @interface OriginEnum {}































    /**









@@ -235,8 +235,6 @@ public abstract class KeyStoreKeyProperties {













        /**















         * Origin of the key is unknown. This can occur only for keys backed by an old TEE















         * implementation which does not record origin information.













         *













         * @hide















         */















        public static final int UNKNOWN = 1 << 2;