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

Commit 78d4712f authored by Chad Brubaker's avatar Chad Brubaker
Browse files

Install the Network Security Config Provider 

The provider is installed early in ActivityThread to ensure that no
TLS objects are created in the application before the provider is
installed.

Change-Id: I5f77addfa75a4ee19301de54e01507d8dca33657
parent 6b4b309f

core/java/android/app/ActivityThread.java

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.provider.Settings;

import android.security.NetworkSecurityPolicy;

import android.security.net.config.NetworkSecurityConfigProvider;

import android.util.AndroidRuntimeException;

import android.util.ArrayMap;

import android.util.DisplayMetrics;
@@ -4831,6 +4832,11 @@ public final class ActivityThread { 
            }

        }



        // Install the Network Security Config Provider. This must happen before the application

        // code is loaded to prevent issues with instances of TLS objects being created before

        // the provider is installed.

        NetworkSecurityConfigProvider.install(appContext);



        // Continue loading instrumentation.

        if (ii != null) {

            final ApplicationInfo instrApp = new ApplicationInfo();

preloaded-classes

+1 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,7 @@ android.security.keystore.AndroidKeyStoreBCWorkaroundProvider 
android.security.keystore.AndroidKeyStoreKey

android.security.keystore.AndroidKeyStoreProvider

android.security.keystore.KeyStoreCryptoOperation

android.security.net.config.NetworkSecurityConfigProvider

android.service.persistentdata.PersistentDataBlockManager

android.system.ErrnoException

android.system.GaiException