From 20c7cad598feef06102b36c132a29e609478719c Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 14 May 2021 17:31:30 +0900 Subject: [PATCH] Address comments on ag/14486203 Bug: 186458024 Test: comment-only change Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: I7b086abbb57354086e8fb1a41c63140f2227173f Change-Id: I7b086abbb57354086e8fb1a41c63140f2227173f (cherry-picked from ag/14540395) --- .../com/android/server/connectivity/NetworkRanker.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/service/src/com/android/server/connectivity/NetworkRanker.java b/service/src/com/android/server/connectivity/NetworkRanker.java index a4085cde4e..d7eb9c8a59 100644 --- a/service/src/com/android/server/connectivity/NetworkRanker.java +++ b/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); }