diff options
| author | Sergio Giro <sgiro@google.com> | 2016-05-24 11:56:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-24 11:56:50 +0000 |
| commit | 393b67d65fdbf4565cbec2f40fcabaaf87143dfd (patch) | |
| tree | 5cd9aad45789bedc4254d93513d980eb2ec1843e /core/java/android | |
| parent | 6f4b5661696355d230c515a45aca2dddd8fe99b1 (diff) | |
| parent | 80755a5a25de5b7c9f2d61e6dba7c2a4656bca89 (diff) | |
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 5fb3635d73f1..0386cff9edea 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -98,7 +98,6 @@ import android.view.Window; import android.view.WindowManager; import android.view.WindowManagerGlobal; import android.renderscript.RenderScriptCacheDir; -import android.security.keystore.AndroidKeyStoreProvider; import android.system.Os; import android.system.OsConstants; import android.system.ErrnoException; @@ -5461,8 +5460,6 @@ public final class ActivityThread { // Set the reporter for event logging in libcore EventLogger.setReporter(new EventLoggingReporter()); - AndroidKeyStoreProvider.install(); - // Make sure TrustedCertificateStore looks in the right place for CA certificates final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId()); TrustedCertificateStore.setDefaultUserDirectory(configDir); |