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

Merge "[NS A42] Move writing to the reassignment to the computation" am: 358eb47a06

Browse Source 
Change-Id: Ic04c72d0720bb53a38329dbcbc75cd914e1296c0
This commit is contained in:
Automerger Merge Worker
2020-02-09 07:05:54 +00:00
parent 5c78cd3eac 358eb47a06
commit 52aa90906f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6620,9 +6620,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
if (currentNetwork == null || currentNetwork.getCurrentScore() < score) {
reassignedRequests.put(nri, newNetwork);
changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
nri, currentNetwork, newNetwork));
}
} else if (newNetwork == currentNetwork) {
reassignedRequests.put(nri, null);
changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
nri, currentNetwork, null));
}
}
return reassignedRequests;
@@ -6663,8 +6667,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
final NetworkRequestInfo nri = entry.getKey();
final NetworkAgentInfo previousSatisfier = nri.mSatisfier;
final NetworkAgentInfo newSatisfier = entry.getValue();
changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
nri, previousSatisfier, newSatisfier));
updateSatisfiersForRematchRequest(nri, previousSatisfier, newSatisfier, now);
}
}