diff options
| author | Robin Lee <rgl@google.com> | 2014-04-25 14:57:49 +0100 |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2014-06-09 12:45:17 +0000 |
| commit | 3d076afc37034c0cf46580bc288a85f65b617399 (patch) | |
| tree | a044cad44bfdda42c91828022bce4fba26aa2e64 /core/java/android/app/ActivityThread.java | |
| parent | 97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7 (diff) | |
| download | frameworks_base-3d076afc37034c0cf46580bc288a85f65b617399.zip frameworks_base-3d076afc37034c0cf46580bc288a85f65b617399.tar.gz frameworks_base-3d076afc37034c0cf46580bc288a85f65b617399.tar.bz2 | |
Choose CA certificate storage according to userId
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.
This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.
Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
Diffstat (limited to 'core/java/android/app/ActivityThread.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(); |