Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b51475c authored by Kenny Root's avatar Kenny Root
Browse files

Revert "Remove AndroidKeyStore from API" 

This reverts commit ce24985a.

Change-Id: I02d6492c8db869619694c7209bb37522a7ec5a29
parent 42967042

api/current.txt

+13 −0
Original line number Diff line number Diff line
@@ -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);

























core/java/android/app/ActivityThread.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -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();

































keystore/java/android/security/AndroidKeyPairGeneratorSpec.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -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;