From ed7a218592049b84360895845bd27eda56f30666 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Thu, 16 Apr 2015 13:51:06 -0700 Subject: Unhide KeyStoreKeyProperties.Origin.UNKNOWN. Bug: 18088752 Change-Id: Idaed45d7e84f5f3eb4f623552b60206c504e967a --- api/current.txt | 1 + api/system-current.txt | 1 + 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 ee0ec9b03ff8..442ab7ca7c6c 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 f47620374ea5..eef0c373e1b4 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; -- cgit v1.2.3-59-g8ed1b