ExternalScoreEvaluator: factor in active network am: 0b9b32c53a am: 818ebf5894

am: 67075d5538

Change-Id: I3bb9a70a537cd9c564c9e7b253a72a18ae146e08

1 files changed, 13 insertions, 6 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java
index ae15bbba2..16f5e0c34 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java
@@ -308,17 +308,24 @@ public class WifiNetworkSelectorTestUtil {
 
         for (int i = 0; i < scanDetails.size(); i++) {
             ScanDetail scanDetail = scanDetails.get(i);
-            byte rssiScore;
-            Integer score = scores[i];
             ScanResult scanResult = scanDetail.getScanResult();
             WifiKey wifiKey = new WifiKey("\"" + scanResult.SSID + "\"", scanResult.BSSID);
             NetworkKey ntwkKey = new NetworkKey(wifiKey);
-            if (scores[i] == null) {
-                rssiScore = WifiNetworkScoreCache.INVALID_NETWORK_SCORE;
+            RssiCurve rssiCurve;
+
+            if (scores != null) { // fixed score
+                byte rssiScore;
+                Integer score = scores[i];
+
+                if (scores[i] == null) {
+                    rssiScore = WifiNetworkScoreCache.INVALID_NETWORK_SCORE;
+                } else {
+                    rssiScore = scores[i].byteValue();
+                }
+                rssiCurve = new RssiCurve(-100, 100, new byte[] {rssiScore});
             } else {
-                rssiScore = scores[i].byteValue();
+                rssiCurve = new RssiCurve(-80, 20, new byte[] {-10, 0, 10, 20, 30, 40});
             }
-            RssiCurve rssiCurve = new RssiCurve(-100, 100, new byte[] {rssiScore});
             ScoredNetwork scoredNetwork = new ScoredNetwork(ntwkKey, rssiCurve, meteredHints[i]);
 
             networks.add(scoredNetwork);