diff options
| -rw-r--r-- | api/current.txt | 13 | ||||
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 | ||||
| -rw-r--r-- | keystore/java/android/security/AndroidKeyPairGeneratorSpec.java | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a0708bbd3675..c9ef978f033f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20437,6 +20437,19 @@ package android.sax { package android.security { + public class AndroidKeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + } + + public static class AndroidKeyPairGeneratorSpec.Builder { + ctor public AndroidKeyPairGeneratorSpec.Builder(android.content.Context); + method public android.security.AndroidKeyPairGeneratorSpec build(); + method public android.security.AndroidKeyPairGeneratorSpec.Builder setAlias(java.lang.String); + method public android.security.AndroidKeyPairGeneratorSpec.Builder setEndDate(java.util.Date); + method public android.security.AndroidKeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger); + method public android.security.AndroidKeyPairGeneratorSpec.Builder setStartDate(java.util.Date); + method public android.security.AndroidKeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal); + } + 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); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index ae0671bf29af..68a239773ee3 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -86,6 +86,7 @@ import android.view.Window; import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.renderscript.RenderScript; +import android.security.AndroidKeyStoreProvider; import com.android.internal.os.BinderInternal; import com.android.internal.os.RuntimeInit; @@ -101,6 +102,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.ref.WeakReference; import java.net.InetAddress; +import java.security.Security; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -5068,6 +5070,8 @@ public final class ActivityThread { // Set the reporter for event logging in libcore EventLogger.setReporter(new EventLoggingReporter()); + Security.addProvider(new AndroidKeyStoreProvider()); + Process.setArgV0("<pre-initialized>"); Looper.prepareMainLooper(); diff --git a/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java b/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java index 83faf356f2d5..18225a542f02 100644 --- a/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java +++ b/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java @@ -49,8 +49,6 @@ import javax.security.auth.x500.X500Principal; * <p> * The self-signed certificate may be replaced at a later time by a certificate * signed by a real Certificate Authority. - * - * @hide */ public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec { private final String mKeystoreAlias; |