Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a54c8246 authored by Robin Lee's avatar Robin Lee Committed by Android Git Automerger
Browse files

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

* commit '0b889cd6':
  Choose CA certificate storage according to userId
parents f89fa833 0b889cd6

core/java/android/app/ActivityThread.java

+5 −0
Original line number Diff line number Diff line
@@ -98,6 +98,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;
@@ -5049,6 +5050,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();