joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Adjust PermissionMonitor#startMonitoring in ConnectivityService" am: 5d6da8de07

Browse source 
am: 9717a198bb

Change-Id: I14ef8eaa83b3df3b032556504a23e6b17f02435d
This commit is contained in:
paulhu 2019-11-24 07:37:03 -08:00 • committed by android-build-merger
commit 97e1cdb105
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
services/core/java/com/android/server/ConnectivityService.java
View file

@ -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();
}
/**