From ce24985ad636c38b6ee01ec9cdecfb038bfeaeb6 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Fri, 14 Sep 2012 16:19:31 -0700
Subject: Remove AndroidKeyStore from API

Change-Id: Ibe09d78e5a5b86604f01144f344525bff94c2dde
---
 api/current.txt                                                 | 4 ----
 core/java/android/app/ActivityThread.java                       | 3 ---
 keystore/java/android/security/AndroidKeyPairGeneratorSpec.java | 1 +
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index c7466c3..ae288d5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20188,10 +20188,6 @@ 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);
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 1cd5fa2..cb4d4a1 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -84,7 +84,6 @@ 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;
@@ -4891,8 +4890,6 @@ 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 311359c..79a7630 100644
--- a/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java
+++ b/keystore/java/android/security/AndroidKeyPairGeneratorSpec.java
@@ -32,6 +32,7 @@ import javax.security.auth.x500.X500Principal;
  * generator that works with
  * <a href="{@docRoot}guide/topics/security/keystore.html">Android KeyStore
  * facility</a>.
+ * @hide
  */
 public class AndroidKeyPairGeneratorSpec implements AlgorithmParameterSpec {
     private final String mKeystoreAlias;
-- 
cgit v1.1