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

[NS A23.1] Minor cleanup

Browse Source 
The argument is always true.

Test: ConnectivityServiceTest
Change-Id: Ibebdae14e63e6baf74db054038ee575ec462f6d5
This commit is contained in:
Chalard Jean
2019-12-09 11:50:38 +09:00
parent 05edd05f53
commit 05cbe97f28
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -5959,7 +5959,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// the change we're processing can't affect any requests, it can only affect the listens // the change we're processing can't affect any requests, it can only affect the listens
// on this network. We might have been called by rematchNetworkAndRequests when a // on this network. We might have been called by rematchNetworkAndRequests when a
// network changed foreground state. // network changed foreground state.
processListenRequests(nai, true); processListenRequests(nai);
} else { } else {
// If the requestable capabilities have changed or the score changed, we can't have been // If the requestable capabilities have changed or the score changed, we can't have been
// called by rematchNetworkAndRequests, so it's safe to start a rematch. // called by rematchNetworkAndRequests, so it's safe to start a rematch.
@@ -6267,14 +6267,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
updateAllVpnsCapabilities(); updateAllVpnsCapabilities();
} }
private void processListenRequests(@NonNull NetworkAgentInfo nai, boolean capabilitiesChanged) { private void processListenRequests(@NonNull final NetworkAgentInfo nai) {
// For consistency with previous behaviour, send onLost callbacks before onAvailable. // For consistency with previous behaviour, send onLost callbacks before onAvailable.
processNewlyLostListenRequests(nai); processNewlyLostListenRequests(nai);
notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED);
if (capabilitiesChanged) {
notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED);
}
processNewlySatisfiedListenRequests(nai); processNewlySatisfiedListenRequests(nai);
} }