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

Commit e54bdb97 authored by paulhu's avatar paulhu Committed by android-build-merger
Browse files

Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: a150138e 

am: 773a92ed

Change-Id: I14ef8eaa83b3df3b032556504a23e6b17f02435d
parents dfb66cca 773a92ed

services/core/java/com/android/server/ConnectivityService.java

+5 −2
Original line number Diff line number Diff line
@@ -2186,6 +2186,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
     */

    @VisibleForTesting

    public void systemReady() {

        // Let PermissionMonitor#startMonitoring() running in the beginning of the systemReady

        // before MultipathPolicyTracker.start(). Since mApps in PermissionMonitor needs to be

        // populated first to ensure that listening network request which is sent by

        // MultipathPolicyTracker won't be added NET_CAPABILITY_FOREGROUND capability.

        mPermissionMonitor.startMonitoring();

        mProxyTracker.loadGlobalProxy();

        registerNetdEventCallback();

        mTethering.systemReady();
@@ -2206,8 +2211,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mHandler.sendMessage(mHandler.obtainMessage(EVENT_CONFIGURE_ALWAYS_ON_NETWORKS));



        mHandler.sendMessage(mHandler.obtainMessage(EVENT_SYSTEM_READY));



        mPermissionMonitor.startMonitoring();

    }



    /**