diff options
| author | Sergio Giro <sgiro@google.com> | 2016-05-24 12:06:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-24 12:06:25 +0000 |
| commit | 163f8a2e9132b60f86f28a352ded1db6a38d367e (patch) | |
| tree | 40970ae8ee8fe0d6d8caedfef83cc82d173d4c7c /core/java/android | |
| parent | f55c9f7aa64660712242705d4e5e89e2191bbf69 (diff) | |
| parent | 393b67d65fdbf4565cbec2f40fcabaaf87143dfd (diff) | |
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"
am: 393b67d65f
* commit '393b67d65fdbf4565cbec2f40fcabaaf87143dfd':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Idc8e1ca4ae2160285fe56995290c241c3a7288f2
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); |