summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-06-09 21:26:21 -0700
committerBrian Carlstrom <bdc@google.com>2011-06-10 10:43:02 -0700
commit42f6528b988e3ae320cda63a2bd63d30d9e56183 (patch)
tree15036acfbdb1d2f35899ba85b27da83ed9b99b99 /keystore
parent21e2f1b4a0877ee38f7ba89eb32f585fb34431f3 (diff)
downloadframeworks_base-42f6528b988e3ae320cda63a2bd63d30d9e56183.zip
frameworks_base-42f6528b988e3ae320cda63a2bd63d30d9e56183.tar.gz
frameworks_base-42f6528b988e3ae320cda63a2bd63d30d9e56183.tar.bz2
New KeyChain API for application access to keystore credentials
The KeyChain API is Currently in use by Browser and validated by Email for client certificate authentication. Change-Id: Ifeab416be594457a05747406e31656e71795cb53
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/KeyChain.java2
-rw-r--r--keystore/java/android/security/KeyChainAliasCallback.java2
-rw-r--r--keystore/java/android/security/KeyChainException.java2
3 files changed, 0 insertions, 6 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index 39d65be..4f1596d 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 daa348b..fc9e64b 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 3953f58..ef97ffb 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 {