SavedNetworkEvaluator: ignore ephemeral networks

Ephemeral networks should be evaluted by ScoredNetworkEvaluator.
Otherwise, an ephemeral network might be chosen over a saved
network. Plus, the SaveNetworkEvaluator's scoring algorithm
is different from the ScoredNetworkEvalutor, so the result
coming out from these two evalutors can be very different.

Bug: 62197617
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I3237b4ca50dd6964dd8678011e6a9940c0ca1d0b

1 files changed, 5 insertions, 4 deletions

diff --git a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java
index bf79edaf8..720afd5a7 100644
--- a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java
+++ b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java
@@ -264,11 +264,12 @@ public class SavedNetworkEvaluator implements WifiNetworkSelector.NetworkEvaluat
 
             for (WifiConfiguration network : associatedConfigurations) {
                 /**
-                 * Ignore Passpoint networks. Passpoint networks are also considered as "saved"
-                 * network, but without being persisted to the storage. They are being evaluated
-                 * by {@link PasspointNetworkEvaluator}.
+                 * Ignore Passpoint and Ephemeral networks. They are configured networks,
+                 * but without being persisted to the storage. They are evaluated by
+                 * {@link PasspointNetworkEvaluator} and {@link ScoredNetworkEvaluator}
+                 * respectively.
                  */
-                if (network.isPasspoint()) {
+                if (network.isPasspoint() || network.isEphemeral()) {
                     continue;
                 }