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

[NS A30] Note linger out of the rematch loop

Browse Source 
This doesn't have to be tested every time.

Test: FrameworksNetTests
Change-Id: Ic5702c8b4bd096860fe55c4d9e4c465703561911
This commit is contained in:
Chalard Jean
2019-12-03 16:06:00 +09:00
parent 7c2f15e1a4
commit bf021685ca
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6573,11 +6573,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// network. Think about if there is a way to reduce this. Push // network. Think about if there is a way to reduce this. Push
// netid->request mapping to each provider? // netid->request mapping to each provider?
sendUpdatedScoreToFactories(nri.request, newSatisfier); sendUpdatedScoreToFactories(nri.request, newSatisfier);
if (isDefaultRequest(nri)) {
if (previousSatisfier != null) {
mLingerMonitor.noteLingerDefaultNetwork(previousSatisfier, newSatisfier);
}
}
} else { } else {
// If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri", // If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri",
// mark it as no longer satisfying "nri". Because networks are processed by // mark it as no longer satisfying "nri". Because networks are processed by
@@ -6633,6 +6628,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
changes.getNewSatisfier(defaultRequestInfo), oldDefaultNetwork); changes.getNewSatisfier(defaultRequestInfo), oldDefaultNetwork);
if (oldDefaultNetwork != newDefaultNetwork) { if (oldDefaultNetwork != newDefaultNetwork) {
if (oldDefaultNetwork != null) {
mLingerMonitor.noteLingerDefaultNetwork(oldDefaultNetwork, newDefaultNetwork);
}
updateDataActivityTracking(newDefaultNetwork, oldDefaultNetwork); updateDataActivityTracking(newDefaultNetwork, oldDefaultNetwork);
// Notify system services that this network is up. // Notify system services that this network is up.
makeDefault(newDefaultNetwork); makeDefault(newDefaultNetwork);