LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
am: 97e1cdb105

Change-Id: I0d50f6bccc9fb18a54865b45a7e8d1eaff01ea9e
This commit is contained in:
paulhu
2019-11-25 08:23:23 -08:00
committed by android-build-merger
parent 6aaf2bc277 97e1cdb105
commit ace8807b44
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 @VisibleForTesting
public void systemReady() { 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(); mProxyTracker.loadGlobalProxy();
registerNetdEventCallback(); registerNetdEventCallback();
mTethering.systemReady(); 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_CONFIGURE_ALWAYS_ON_NETWORKS));
mHandler.sendMessage(mHandler.obtainMessage(EVENT_SYSTEM_READY)); mHandler.sendMessage(mHandler.obtainMessage(EVENT_SYSTEM_READY));
mPermissionMonitor.startMonitoring();
} }
/** /**