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

Merge "[NS A40] Read current reassignment state instead of global state"

Browse Source
This commit is contained in:
Chalard Jean
2020-02-06 04:14:43 +00:00
committed by Gerrit Code Review
parent e10545c736 7e416aa19e
commit 47dad79bf6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6561,6 +6561,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
private ArrayMap<NetworkRequestInfo, NetworkAgentInfo> computeRequestReassignmentForNetwork( private ArrayMap<NetworkRequestInfo, NetworkAgentInfo> computeRequestReassignmentForNetwork(
@NonNull final NetworkReassignment changes,
@NonNull final NetworkAgentInfo newNetwork) { @NonNull final NetworkAgentInfo newNetwork) {
final int score = newNetwork.getCurrentScore(); final int score = newNetwork.getCurrentScore();
final ArrayMap<NetworkRequestInfo, NetworkAgentInfo> reassignedRequests = new ArrayMap<>(); final ArrayMap<NetworkRequestInfo, NetworkAgentInfo> reassignedRequests = new ArrayMap<>();
@@ -6571,7 +6572,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
// requests or not, and doesn't affect the network's score. // requests or not, and doesn't affect the network's score.
if (nri.request.isListen()) continue; if (nri.request.isListen()) continue;
final NetworkAgentInfo currentNetwork = nri.mSatisfier; // The reassignment has been seeded with the initial assignment, therefore
// getReassignment can't be null and mNewNetwork is only null if there was no
// satisfier in the first place or there was an explicit reassignment to null.
final NetworkAgentInfo currentNetwork = changes.getReassignment(nri).mNewNetwork;
final boolean satisfies = newNetwork.satisfies(nri.request); final boolean satisfies = newNetwork.satisfies(nri.request);
if (newNetwork == currentNetwork && satisfies) continue; if (newNetwork == currentNetwork && satisfies) continue;
@@ -6621,7 +6625,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (VDBG || DDBG) log("rematching " + newNetwork.name()); if (VDBG || DDBG) log("rematching " + newNetwork.name());
final ArrayMap<NetworkRequestInfo, NetworkAgentInfo> reassignedRequests = final ArrayMap<NetworkRequestInfo, NetworkAgentInfo> reassignedRequests =
computeRequestReassignmentForNetwork(newNetwork); computeRequestReassignmentForNetwork(changes, newNetwork);
// Find and migrate to this Network any NetworkRequests for // Find and migrate to this Network any NetworkRequests for
// which this network is now the best. // which this network is now the best.