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

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

Browse Source 
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
This commit is contained in:
Robin Lee
2014-06-09 12:55:13 +00:00
committed by Android Git Automerger
parent ee20e16d7b db9e0a674a
commit 0b889cd66f
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.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();