Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide KeyStoreKeyProperties.Origin.UNKNOWN."

Browse Source
This commit is contained in:
Alex Klyubin
2015-04-16 22:31:24 +00:00
committed by Android (Google) Code Review
parent 35075a0765 ed7a218592
commit 1a02a53cf4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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 {

1
api/system-current.txt
View File

@@ -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 {

4
keystore/java/android/security/KeyStoreKeyProperties.java
View File

@@ -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;