diff options
| author | Robin Lee <rgl@google.com> | 2014-06-09 12:51:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 12:51:19 +0000 |
| commit | db9e0a674ac3a9c71699618cb525fdd3c4669e30 (patch) | |
| tree | d39f50b9356a43e384aad5da2494a91669eae231 /core/java | |
| parent | 337f97bedc09354ea9a8a506aefccc39dd4248e8 (diff) | |
| parent | 01c07a856de163dc9a6fd31ea4b42293d221ee63 (diff) | |
| download | frameworks_base-db9e0a674ac3a9c71699618cb525fdd3c4669e30.zip frameworks_base-db9e0a674ac3a9c71699618cb525fdd3c4669e30.tar.gz frameworks_base-db9e0a674ac3a9c71699618cb525fdd3c4669e30.tar.bz2 | |
am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
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 9a3478e..c931d79 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; @@ -5040,6 +5041,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(); |