diff options
author | Alex Klyubin <klyubin@google.com> | 2015-04-16 13:51:06 -0700 |
---|---|---|
committer | Alex Klyubin <klyubin@google.com> | 2015-04-16 15:26:50 -0700 |
commit | ed7a218592049b84360895845bd27eda56f30666 (patch) | |
tree | cf9acc0b352880dacf91fd4a14e7e3b08a991f19 /api | |
parent | aa0d7f60b6efe093dbf9281ccb89597a421bca1d (diff) | |
download | frameworks_base-ed7a218592049b84360895845bd27eda56f30666.zip frameworks_base-ed7a218592049b84360895845bd27eda56f30666.tar.gz frameworks_base-ed7a218592049b84360895845bd27eda56f30666.tar.bz2 |
Unhide KeyStoreKeyProperties.Origin.UNKNOWN.
Bug: 18088752
Change-Id: Idaed45d7e84f5f3eb4f623552b60206c504e967a
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 | ||||
-rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ee0ec9b..442ab7c 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 f476203..eef0c37 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 { |