diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-06-29 18:53:17 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-06-29 20:32:54 -0700 |
| commit | ca43c458ad0ee8cfa7f5eabc8ba1a65ae473976b (patch) | |
| tree | dcfa3b84dbeefe5928770600b316bc94e6de02e0 /api | |
| parent | 6e24576b6b10336e37c6447a5e2dbde5ea332da6 (diff) | |
| download | frameworks_base-ca43c458ad0ee8cfa7f5eabc8ba1a65ae473976b.zip frameworks_base-ca43c458ad0ee8cfa7f5eabc8ba1a65ae473976b.tar.gz frameworks_base-ca43c458ad0ee8cfa7f5eabc8ba1a65ae473976b.tar.bz2 | |
New KeyChain API for credential installation
Bug: 3497064
Change-Id: Ie5c20e87a436b7ab66258d08b719ab8bb1f1d86d
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 f21a4f3..597daf7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17505,8 +17505,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 { |