diff options
| author | Robin Lee <rgl@google.com> | 2014-06-09 14:47:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 14:47:04 +0000 |
| commit | a54c8246a58a1ae5ca3c364c0469f82ba8994a1b (patch) | |
| tree | 2c357274815d543581371aa52ea40f0763f4168a /core/java | |
| parent | f89fa8337466be97e40c3ae3cc37704e3f666b5e (diff) | |
| parent | 0b889cd66fdb739a8078fb50212501849e35eb1e (diff) | |
| download | frameworks_base-a54c8246a58a1ae5ca3c364c0469f82ba8994a1b.zip frameworks_base-a54c8246a58a1ae5ca3c364c0469f82ba8994a1b.tar.gz frameworks_base-a54c8246a58a1ae5ca3c364c0469f82ba8994a1b.tar.bz2 | |
am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
Choose CA certificate storage according to userId
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index d9adba3..ea46044 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -98,6 +98,7 @@ import com.android.internal.os.RuntimeInit; import com.android.internal.os.SamplingProfilerIntegration; import com.android.internal.util.FastPrintWriter; import com.android.org.conscrypt.OpenSSLSocketImpl; +import com.android.org.conscrypt.TrustedCertificateStore; import com.google.android.collect.Lists; import dalvik.system.VMRuntime; @@ -5049,6 +5050,10 @@ public final class ActivityThread { Security.addProvider(new AndroidKeyStoreProvider()); + // Make sure TrustedCertificateStore looks in the right place for CA certificates + final File configDir = Environment.getUserConfigDirectory(UserHandle.myUserId()); + TrustedCertificateStore.setDefaultUserDirectory(configDir); + Process.setArgV0("<pre-initialized>"); Looper.prepareMainLooper(); |