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

[NS A21] More cleanup

Browse Source 
Test: FrameworksNetTests NetworkStackTests
Change-Id: I4771f2e9151ff16a7045d9c3025ac686f244b22d
This commit is contained in:
Chalard Jean
2019-11-19 22:20:55 +09:00
parent 5c4bddb8cd
commit 1123f5d067
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6468,8 +6468,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
// before LegacyTypeTracker sends legacy broadcasts // before LegacyTypeTracker sends legacy broadcasts
for (NetworkRequestInfo nri : addedRequests) notifyNetworkAvailable(newNetwork, nri); for (NetworkRequestInfo nri : addedRequests) notifyNetworkAvailable(newNetwork, nri);
// Second pass: process all listens. // Maybe the network changed background states. Update its capabilities.
if (wasBackgroundNetwork != newNetwork.isBackgroundNetwork()) { final boolean backgroundChanged = wasBackgroundNetwork != newNetwork.isBackgroundNetwork();
if (backgroundChanged) {
final NetworkCapabilities newNc = mixInCapabilities(newNetwork, final NetworkCapabilities newNc = mixInCapabilities(newNetwork,
newNetwork.networkCapabilities); newNetwork.networkCapabilities);
@@ -6486,13 +6487,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
synchronized (newNetwork) { synchronized (newNetwork) {
newNetwork.setNetworkCapabilities(newNc); newNetwork.setNetworkCapabilities(newNc);
} }
// The requestable capabilities and the score can't have changed, therefore the change
// in background can't affect any requests. Only processing the listens is fine.
processListenRequests(newNetwork, true);
} else {
processListenRequests(newNetwork, false);
} }
// Finally, process listen requests.
processListenRequests(newNetwork, backgroundChanged);
} }
/** /**