diff options
| author | 2015-04-16 22:31:24 +0000 | |
|---|---|---|
| committer | 2015-04-16 22:31:31 +0000 | |
| commit | 1a02a53cf47bbee4b82be6d87d654fcecbabffde (patch) | |
| tree | df719234409c5615ed001a205a77bee683df423b | |
| parent | 35075a07659254413b587b7a6557a1b922d8757f (diff) | |
| parent | ed7a218592049b84360895845bd27eda56f30666 (diff) | |
Merge "Unhide KeyStoreKeyProperties.Origin.UNKNOWN."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyStoreKeyProperties.java | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 2019c3e9a816..5437d5680903 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 { diff --git a/api/system-current.txt b/api/system-current.txt index df2038b8c081..b2bee6ebfbe2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 { diff --git a/keystore/java/android/security/KeyStoreKeyProperties.java b/keystore/java/android/security/KeyStoreKeyProperties.java index a0faf88ec9e1..206103f44908 100644 --- a/keystore/java/android/security/KeyStoreKeyProperties.java +++ b/keystore/java/android/security/KeyStoreKeyProperties.java @@ -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; |