summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-08-22 08:55:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-22 08:55:26 -0700
commit9b90ee2d0bb6fb9147d3fad3a1c60326fd6f0fd4 (patch)
treeabd4d23ebfd44eb06d5171718a9cddd51149c536 /api
parent2bd65b61ba6e98496dc574251e06709546d24500 (diff)
parentdb026710ec0adcf7f72dfb24c65d38a882ee26d8 (diff)
downloadframeworks_base-9b90ee2d0bb6fb9147d3fad3a1c60326fd6f0fd4.zip
frameworks_base-9b90ee2d0bb6fb9147d3fad3a1c60326fd6f0fd4.tar.gz
frameworks_base-9b90ee2d0bb6fb9147d3fad3a1c60326fd6f0fd4.tar.bz2
Merge "Add KeyPairGenerator for Android keystore" into jb-mr1-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index a29cdba..8a7fb79 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19988,6 +19988,10 @@ package android.sax {
package android.security {
+ public class AndroidKeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec {
+ ctor public AndroidKeyPairGeneratorSpec(android.content.Context, java.lang.String, javax.security.auth.x500.X500Principal, java.math.BigInteger, java.util.Date, java.util.Date);
+ }
+
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);