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

Commit 4c7698f6 authored by Chad Brubaker's avatar Chad Brubaker
Browse files

Don't touch NetworkSecurityPolicy in ActivityThread 

The values in NetworkSecurityPolicy set by ActivityThread are
just immediately replaced by the NetworkSecurityConfigProvider.

Change-Id: I576a8fe51bd41292db2d20d302492849d2202f4e
parent 276ee969

core/java/android/app/ActivityThread.java

+0 −4
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import android.os.Trace; 
import android.os.TransactionTooLargeException;

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;
@@ -5133,9 +5132,6 @@ public final class ActivityThread { 
            StrictMode.enableDeathOnFileUriExposure();

        }



        NetworkSecurityPolicy.getInstance().setCleartextTrafficPermitted(

                (data.appInfo.flags & ApplicationInfo.FLAG_USES_CLEARTEXT_TRAFFIC) != 0);



        if (data.debugMode != IApplicationThread.DEBUG_OFF) {

            // XXX should have option to change the port.

            Debug.changeDebugPort(8100);