diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-07-06 14:59:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-06 14:59:21 -0700 |
| commit | 74e6bd7b7783fb506d7525e9ba40aac980745eaf (patch) | |
| tree | ba5021a7f07abdbf6c2766973c50f4d8e614c8f0 /api | |
| parent | 28db8b944a589b9db0474c90e64875c6023292bb (diff) | |
| parent | ca43c458ad0ee8cfa7f5eabc8ba1a65ae473976b (diff) | |
| download | frameworks_base-74e6bd7b7783fb506d7525e9ba40aac980745eaf.zip frameworks_base-74e6bd7b7783fb506d7525e9ba40aac980745eaf.tar.gz frameworks_base-74e6bd7b7783fb506d7525e9ba40aac980745eaf.tar.bz2 | |
Merge "New KeyChain API for credential installation"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d7e3cb3..7e348f8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17515,8 +17515,12 @@ 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, java.lang.String); + method public static android.content.Intent createInstallIntent(); 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; + field public static final java.lang.String EXTRA_CERTIFICATE = "CERT"; + field public static final java.lang.String EXTRA_NAME = "name"; + field public static final java.lang.String EXTRA_PKCS12 = "PKCS12"; } public abstract interface KeyChainAliasCallback { |