summaryrefslogtreecommitdiff
path: root/packages/Connectivity
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-05-14 09:59:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-05-14 09:59:43 +0000
commitdc9b300cf36d80bc18a08bc5b692b9d69554118b (patch)
tree189e7ea8848c03b9062c72eda205373b310f06b2 /packages/Connectivity
parent1595a20d566f514055d6a763cc9d3e35b598fa16 (diff)
parentf27877ae89d66cae3df8fb4d35555cb4a9e4a19a (diff)
Merge "Address comments on ag/14486203" into sc-dev
Diffstat (limited to 'packages/Connectivity')
-rw-r--r--packages/Connectivity/service/src/com/android/server/connectivity/NetworkRanker.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/Connectivity/service/src/com/android/server/connectivity/NetworkRanker.java b/packages/Connectivity/service/src/com/android/server/connectivity/NetworkRanker.java
index a4085cde4e21..d7eb9c8a59b8 100644
--- a/packages/Connectivity/service/src/com/android/server/connectivity/NetworkRanker.java
+++ b/packages/Connectivity/service/src/com/android/server/connectivity/NetworkRanker.java
@@ -237,9 +237,9 @@ public class NetworkRanker {
partitionInto(candidates, nai -> nai.getScore().hasPolicy(POLICY_TRANSPORT_PRIMARY),
accepted, rejected);
if (accepted.size() > 0) {
- // Some networks are primary. For each transport, keep only the primary, but also
- // keep all networks for which there isn't a primary (which are now in the |rejected|
- // array).
+ // Some networks are primary for their transport. For each transport, keep only the
+ // primary, but also keep all networks for which there isn't a primary (which are now
+ // in the |rejected| array).
// 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.
for (final T defaultSubNai : accepted) {
@@ -247,6 +247,8 @@ public class NetworkRanker {
rejected.removeIf(
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);
candidates = new ArrayList<>(accepted);
}