Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 01c07a85: Merge "Choose CA certificate storage according to userId"

Browse Source 
* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
  Choose CA certificate storage according to userId
This commit is contained in:
Robin Lee
2014-06-09 12:51:19 +00:00
committed by Android Git Automerger
parent 337f97bedc 01c07a856d
commit db9e0a674a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ActivityThread.java
View File

@@ -95,6 +95,7 @@ import com.android.internal.os.RuntimeInit;
import com.android.internal.os.SamplingProfilerIntegration; import com.android.internal.os.SamplingProfilerIntegration;
import com.android.internal.util.FastPrintWriter; import com.android.internal.util.FastPrintWriter;
import com.android.org.conscrypt.OpenSSLSocketImpl; import com.android.org.conscrypt.OpenSSLSocketImpl;
import com.android.org.conscrypt.TrustedCertificateStore;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import dalvik.system.VMRuntime; import dalvik.system.VMRuntime;
@@ -5040,6 +5041,10 @@ public final class ActivityThread {
Security.addProvider(new AndroidKeyStoreProvider()); 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>"); Process.setArgV0("<pre-initialized>");
Looper.prepareMainLooper(); Looper.prepareMainLooper();