diff options
| -rw-r--r-- | api/current.txt | 22 | ||||
| -rw-r--r-- | core/java/android/security/package.html | 6 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyChainAliasCallback.java | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyChainException.java | 2 |
5 files changed, 22 insertions, 12 deletions
diff --git a/api/current.txt b/api/current.txt index daad5df1be42..affe91bba1a4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17361,6 +17361,28 @@ package android.sax { } +package android.security { + + public final class KeyChain { + ctor public KeyChain(); + method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int); + method public static java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; + method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; + } + + public abstract interface KeyChainAliasCallback { + method public abstract void alias(java.lang.String); + } + + public class KeyChainException extends java.lang.Exception { + ctor public KeyChainException(); + ctor public KeyChainException(java.lang.String); + ctor public KeyChainException(java.lang.String, java.lang.Throwable); + ctor public KeyChainException(java.lang.Throwable); + } + +} + package android.service.wallpaper { public abstract class WallpaperService extends android.app.Service { diff --git a/core/java/android/security/package.html b/core/java/android/security/package.html deleted file mode 100644 index dfc6303fe4ad..000000000000 --- a/core/java/android/security/package.html +++ /dev/null @@ -1,6 +0,0 @@ -<HTML> -<BODY> -Utilities for encrypting messages from hash functions. -{@hide} -</BODY> -</HTML> diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index 39d65be3546d..4f1596df8b02 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -76,8 +76,6 @@ import java.util.concurrent.LinkedBlockingQueue; * avoid prompting the user with {@link #choosePrivateKeyAlias * choosePrivateKeyAlias} on subsequent connections. If the alias is * no longer valid, null will be returned on lookups using that value - * - * @hide to be unhidden as part of KeyChain API */ // TODO reference intent for credential installation when public public final class KeyChain { diff --git a/keystore/java/android/security/KeyChainAliasCallback.java b/keystore/java/android/security/KeyChainAliasCallback.java index daa348b1c6b3..fc9e64b3236b 100644 --- a/keystore/java/android/security/KeyChainAliasCallback.java +++ b/keystore/java/android/security/KeyChainAliasCallback.java @@ -22,8 +22,6 @@ import java.security.cert.X509Certificate; /** * The KeyChainAliasCallback is the callback for {@link * KeyChain#choosePrivateKeyAlias}. - * - * @hide to be unhidden as part of KeyChain API */ public interface KeyChainAliasCallback { diff --git a/keystore/java/android/security/KeyChainException.java b/keystore/java/android/security/KeyChainException.java index 3953f58ae600..ef97ffb4c436 100644 --- a/keystore/java/android/security/KeyChainException.java +++ b/keystore/java/android/security/KeyChainException.java @@ -18,8 +18,6 @@ package android.security; /** * Thrown on problems accessing the {@link KeyChain}. - * - * @hide to be unhidden as part of KeyChain API */ public class KeyChainException extends Exception { |