From 5e8f8431d8f1756d96ea5e488e8c40c4fc7fb259 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Thu, 8 Apr 2021 20:50:26 +0900 Subject: [PATCH] Use filter from CollectionUtils. Test: ConnectivityServiceTest Fixes: 184826320 Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: Iae8df6058c0a43fba1e6ebcd6003df54751f9646 Change-Id: Iae8df6058c0a43fba1e6ebcd6003df54751f9646 (cherry-picked from ag/14125157) --- .../android/server/connectivity/NetworkRanker.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/service/src/com/android/server/connectivity/NetworkRanker.java b/service/src/com/android/server/connectivity/NetworkRanker.java index c123ea75c6..2b345e5aa7 100644 --- a/service/src/com/android/server/connectivity/NetworkRanker.java +++ b/service/src/com/android/server/connectivity/NetworkRanker.java @@ -24,6 +24,7 @@ import static android.net.NetworkScore.POLICY_EXITING; import static android.net.NetworkScore.POLICY_TRANSPORT_PRIMARY; import static android.net.NetworkScore.POLICY_YIELD_TO_BAD_WIFI; +import static com.android.net.module.util.CollectionUtils.filter; import static com.android.server.connectivity.FullScore.POLICY_ACCEPT_UNVALIDATED; import static com.android.server.connectivity.FullScore.POLICY_EVER_USER_SELECTED; import static com.android.server.connectivity.FullScore.POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD; @@ -66,18 +67,6 @@ public class NetworkRanker { public NetworkRanker() { } - // TODO : move to module utils CollectionUtils. - @NonNull private static ArrayList filter(@NonNull final Collection source, - @NonNull final Predicate test) { - final ArrayList matches = new ArrayList<>(); - for (final T e : source) { - if (test.test(e)) { - matches.add(e); - } - } - return matches; - } - /** * Find the best network satisfying this request among the list of passed networks. */