diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-30 16:12:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 16:12:33 +0000 |
| commit | 403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc (patch) | |
| tree | dee1473b960cf0749c1d5a5febd066fb787a328e /core | |
| parent | 8310f87d96791e8b864df5e821fe65273c2dd874 (diff) | |
| parent | 4812563f68c87278af68309662433279d10f573e (diff) | |
| download | frameworks_base-403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc.zip frameworks_base-403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc.tar.gz frameworks_base-403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc.tar.bz2 | |
Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 9bad9bb..2e45b79 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -114,7 +114,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.ref.WeakReference; import java.net.InetAddress; -import java.security.Security; import java.text.DateFormat; import java.util.ArrayList; import java.util.List; @@ -5338,7 +5337,7 @@ public final class ActivityThread { // Set the reporter for event logging in libcore EventLogger.setReporter(new EventLoggingReporter()); - Security.addProvider(new AndroidKeyStoreProvider()); + AndroidKeyStoreProvider.install(); // Make sure TrustedCertificateStore looks in the right place for CA certificates final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId()); |