Merge changes from topic "revert-10338939-YCRBMILGZV"

* changes:
  Revert "[NS D03] Migrate the bad wifi avoidance policy"
  Revert "[NS D04] Implement a simple speed comparison between scores."

4 files changed, 2 insertions, 133 deletions

diff --git a/core/java/android/net/NetworkScore.java b/core/java/android/net/NetworkScore.java
index d207e7960d34..d2e59eb89309 100644
--- a/core/java/android/net/NetworkScore.java
+++ b/core/java/android/net/NetworkScore.java
@@ -83,65 +83,6 @@ public final class NetworkScore implements Parcelable {
             uplinkBandwidthKBps = uplinkBandwidth;
         }
 
-        /**
-         * Evaluate whether a metrics codes for faster network is faster than another.
-         *
-         * This is a simple comparison of expected speeds. If either of the tested attributes
-         * are unknown, this returns zero. This implementation just assumes downlink bandwidth
-         * is more important than uplink bandwidth, which is more important than latency. This
-         * is not a very good way of evaluating network speed, but it's a start.
-         * TODO : do something more representative of how fast the network feels
-         *
-         * @param other the Metrics to evaluate against
-         * @return a negative integer, zero, or a positive integer as this metrics is worse than,
-         *   equally good as (or unknown), or better than the passed Metrics.
-         * @see #compareToPreferringKnown(Metrics)
-         * @hide
-         */
-        // Can't implement Comparable<Metrics> because this is @hide.
-        public int compareTo(@NonNull final Metrics other) {
-            if (downlinkBandwidthKBps != BANDWIDTH_UNKNOWN
-                    && other.downlinkBandwidthKBps != BANDWIDTH_UNKNOWN) {
-                if (downlinkBandwidthKBps > other.downlinkBandwidthKBps) return 1;
-                if (downlinkBandwidthKBps < other.downlinkBandwidthKBps) return -1;
-            }
-            if (uplinkBandwidthKBps != BANDWIDTH_UNKNOWN
-                    && other.uplinkBandwidthKBps != BANDWIDTH_UNKNOWN) {
-                if (uplinkBandwidthKBps > other.uplinkBandwidthKBps) return 1;
-                if (uplinkBandwidthKBps < other.uplinkBandwidthKBps) return -1;
-            }
-            if (latencyMs != LATENCY_UNKNOWN && other.latencyMs != LATENCY_UNKNOWN) {
-                // Latency : lower is better
-                if (latencyMs > other.latencyMs) return -1;
-                if (latencyMs < other.latencyMs) return 1;
-            }
-            return 0;
-        }
-
-        /**
-         * Evaluate whether a metrics codes for faster network is faster than another.
-         *
-         * This is a simple comparison of expected speeds. If either of the tested attributes
-         * are unknown, this prefers the known attributes. This implementation just assumes
-         * downlink bandwidth is more important than uplink bandwidth, which is more important than
-         * latency. This is not a very good way of evaluating network speed, but it's a start.
-         * TODO : do something more representative of how fast the network feels
-         *
-         * @param other the Metrics to evaluate against
-         * @return a negative integer, zero, or a positive integer as this metrics is worse than,
-         *   equally good as (or unknown), or better than the passed Metrics.
-         * @see #compareTo(Metrics)
-         * @hide
-         */
-        public int compareToPreferringKnown(@NonNull final Metrics other) {
-            if (downlinkBandwidthKBps > other.downlinkBandwidthKBps) return 1;
-            if (downlinkBandwidthKBps < other.downlinkBandwidthKBps) return -1;
-            if (uplinkBandwidthKBps > other.uplinkBandwidthKBps) return 1;
-            if (uplinkBandwidthKBps < other.uplinkBandwidthKBps) return -1;
-            // Latency : lower is better
-            return -Integer.compare(latencyMs, other.latencyMs);
-        }
-
         /** toString */
         public String toString() {
             return "latency = " + latencyMs + " downlinkBandwidth = " + downlinkBandwidthKBps
@@ -405,33 +346,6 @@ public final class NetworkScore implements Parcelable {
         return mLegacyScore;
     }
 
-    /**
-     * Use the metrics to evaluate whether a network is faster than another.
-     *
-     * This is purely based on the metrics, and explicitly ignores policy or exiting. It's
-     * provided to get a decision on two networks when policy can not decide, or to evaluate
-     * how a network is expected to compare to another if it should validate.
-     *
-     * @param other the score to evaluate against
-     * @return whether this network is probably faster than the other
-     * @hide
-     */
-    public boolean probablyFasterThan(@NonNull final NetworkScore other) {
-        if (mLegacyScore > other.mLegacyScore) return true;
-        final int atEndToEnd = mEndToEndMetrics.compareTo(other.mEndToEndMetrics);
-        if (atEndToEnd > 0) return true;
-        if (atEndToEnd < 0) return false;
-        final int atLinkLayer = mLinkLayerMetrics.compareTo(other.mLinkLayerMetrics);
-        if (atLinkLayer > 0) return true;
-        if (atLinkLayer < 0) return false;
-        final int atEndToEndPreferringKnown =
-                mEndToEndMetrics.compareToPreferringKnown(other.mEndToEndMetrics);
-        if (atEndToEndPreferringKnown > 0) return true;
-        if (atEndToEndPreferringKnown < 0) return false;
-        // If this returns 0, neither is "probably faster" so just return false.
-        return mLinkLayerMetrics.compareToPreferringKnown(other.mLinkLayerMetrics) > 0;
-    }
-
     /** Builder for NetworkScore. */
     public static class Builder {
         private int mPolicy = 0;
diff --git a/core/java/com/android/internal/util/FunctionalUtils.java b/core/java/com/android/internal/util/FunctionalUtils.java
index 720f4feeaebe..3c9791791a68 100644
--- a/core/java/com/android/internal/util/FunctionalUtils.java
+++ b/core/java/com/android/internal/util/FunctionalUtils.java
@@ -16,16 +16,12 @@
 
 package com.android.internal.util;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.os.RemoteException;
 import android.util.ExceptionUtils;
 
-import java.util.Collection;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 /**
@@ -222,20 +218,4 @@ public class FunctionalUtils {
             }
         }
     }
-
-    /**
-     * Find the first element in the list that matches the predicate.
-     *
-     * The standard Java way of doing this is to use streams, which is very expensive.
-     *
-     * @return the first matching element, or null if none.
-     */
-    @Nullable
-    public static <T> T findFirst(@NonNull final Collection<T> haystack,
-            @NonNull final Predicate<T> p) {
-        for (final T needle : haystack) {
-            if (p.test(needle)) return needle;
-        }
-        return null;
-    }
 }
diff --git a/services/core/java/com/android/server/connectivity/NetworkRanker.java b/services/core/java/com/android/server/connectivity/NetworkRanker.java
index c536ab25e925..1ae7dc5c3676 100644
--- a/services/core/java/com/android/server/connectivity/NetworkRanker.java
+++ b/services/core/java/com/android/server/connectivity/NetworkRanker.java
@@ -16,13 +16,8 @@
 
 package com.android.server.connectivity;
 
-import static android.net.NetworkScore.POLICY_IGNORE_ON_WIFI;
-
-import static com.android.internal.util.FunctionalUtils.findFirst;
-
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
 
 import java.util.ArrayList;
@@ -42,33 +37,15 @@ public class NetworkRanker {
             @NonNull final Collection<NetworkAgentInfo> nais) {
         final ArrayList<NetworkAgentInfo> candidates = new ArrayList<>(nais);
         candidates.removeIf(nai -> !nai.satisfies(request));
-        // Enforce policy.
-        filterBadWifiAvoidancePolicy(candidates);
 
         NetworkAgentInfo bestNetwork = null;
         int bestScore = Integer.MIN_VALUE;
         for (final NetworkAgentInfo nai : candidates) {
-            final int score = nai.getCurrentScore();
-            if (score > bestScore) {
+            if (nai.getCurrentScore() > bestScore) {
                 bestNetwork = nai;
-                bestScore = score;
+                bestScore = nai.getCurrentScore();
             }
         }
         return bestNetwork;
     }
-
-    // If some network with wifi transport is present, drop all networks with POLICY_IGNORE_ON_WIFI.
-    private void filterBadWifiAvoidancePolicy(
-            @NonNull final ArrayList<NetworkAgentInfo> candidates) {
-        final NetworkAgentInfo wifi = findFirst(candidates,
-                nai -> nai.networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-                        && nai.everValidated
-                        // Horrible hack : there is old UI that will let a user say they want to
-                        // override the policy only for this network only at this time and it
-                        // feeds into the following member. This old UI should probably be removed
-                        // but for now keep backward compatibility.
-                        && !nai.avoidUnvalidated);
-        if (null == wifi) return; // No wifi : this policy doesn't apply
-        candidates.removeIf(nai -> nai.getNetworkScore().hasPolicy(POLICY_IGNORE_ON_WIFI));
-    }
 }
diff --git a/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt b/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
index a6b371a23b58..86c91165f61b 100644
--- a/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
+++ b/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
@@ -16,7 +16,6 @@
 
 package com.android.server.connectivity
 
-import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import androidx.test.filters.SmallTest
 import androidx.test.runner.AndroidJUnit4
@@ -36,7 +35,6 @@ class NetworkRankerTest {
     private fun makeNai(satisfy: Boolean, score: Int) = mock(NetworkAgentInfo::class.java).also {
         doReturn(satisfy).`when`(it).satisfies(any())
         doReturn(score).`when`(it).currentScore
-        it.networkCapabilities = NetworkCapabilities()
     }
 
     @Test