diff options
| author | Robin Lee <rgl@google.com> | 2014-06-09 12:47:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-09 12:47:08 +0000 |
| commit | 01c07a856de163dc9a6fd31ea4b42293d221ee63 (patch) | |
| tree | a044cad44bfdda42c91828022bce4fba26aa2e64 /core/java/android | |
| parent | 97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7 (diff) | |
| parent | 3d076afc37034c0cf46580bc288a85f65b617399 (diff) | |
| download | frameworks_base-01c07a856de163dc9a6fd31ea4b42293d221ee63.zip frameworks_base-01c07a856de163dc9a6fd31ea4b42293d221ee63.tar.gz frameworks_base-01c07a856de163dc9a6fd31ea4b42293d221ee63.tar.bz2 | |
Merge "Choose CA certificate storage according to userId"
Diffstat (limited to 'core/java/android')
| -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(); |