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

Address comments on ag/14486203 am: 20c7cad598

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744649

Change-Id: Icfbf8cb124277e54fad40d6d4e558b76d904fdba
This commit is contained in:
Chalard Jean
2021-06-24 10:41:33 +00:00
committed by Automerger Merge Worker
parent bd9ed64c5d 20c7cad598
commit a7697d1718
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/src/com/android/server/connectivity/NetworkRanker.java
View File

@@ -237,9 +237,9 @@ public class NetworkRanker {
partitionInto(candidates, nai -> nai.getScore().hasPolicy(POLICY_TRANSPORT_PRIMARY), partitionInto(candidates, nai -> nai.getScore().hasPolicy(POLICY_TRANSPORT_PRIMARY),
accepted, rejected); accepted, rejected);
if (accepted.size() > 0) { if (accepted.size() > 0) {
// Some networks are primary. For each transport, keep only the primary, but also // Some networks are primary for their transport. For each transport, keep only the
// keep all networks for which there isn't a primary (which are now in the |rejected| // primary, but also keep all networks for which there isn't a primary (which are now
// array). // in the |rejected| array).
// So for each primary network, remove from |rejected| all networks with the same // So for each primary network, remove from |rejected| all networks with the same
// transports as one of the primary networks. The remaining networks should be accepted. // transports as one of the primary networks. The remaining networks should be accepted.
for (final T defaultSubNai : accepted) { for (final T defaultSubNai : accepted) {
@@ -247,6 +247,8 @@ public class NetworkRanker {
rejected.removeIf( rejected.removeIf(
nai -> Arrays.equals(transports, nai.getCapsNoCopy().getTransportTypes())); nai -> Arrays.equals(transports, nai.getCapsNoCopy().getTransportTypes()));
} }
// Now the |rejected| list contains networks with transports for which there isn't
// a primary network. Add them back to the candidates.
accepted.addAll(rejected); accepted.addAll(rejected);
candidates = new ArrayList<>(accepted); candidates = new ArrayList<>(accepted);
} }