diff options
| author | Robin Lee <rgl@google.com> | 2014-06-09 12:55:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 12:55:13 +0000 |
| commit | 0b889cd66fdb739a8078fb50212501849e35eb1e (patch) | |
| tree | a03a6bef5df026ed398e2fb40cdc03c7f9c4e5d0 | |
| parent | ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d (diff) | |
| parent | db9e0a674ac3a9c71699618cb525fdd3c4669e30 (diff) | |
| download | frameworks_base-0b889cd66fdb739a8078fb50212501849e35eb1e.zip frameworks_base-0b889cd66fdb739a8078fb50212501849e35eb1e.tar.gz frameworks_base-0b889cd66fdb739a8078fb50212501849e35eb1e.tar.bz2 | |
am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
Choose CA certificate storage according to userId
| -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 7f8dbba..156eadb 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -95,6 +95,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; @@ -5052,6 +5053,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(); |