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

Commit f2d73701 authored by paulhu's avatar paulhu
Browse files

Adjust PermissionMonitor#startMonitoring in ConnectivityService 

Let PermissionMonitor#startMonitoring() running in the beginning
of the ConnectivityService#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.

Bug: 135897744
Test: atest FrameworksNetTests
Change-Id: Ibef8e7b0017a77384630d34c9edc6c40875f773e
parent 1a2b9406

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

+5 −2
Original line number Diff line number Diff line
@@ -2185,6 +2185,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();
@@ -2205,8 +2210,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();

    }



    /**