Merge changes Ia7dd4afc,Ia7f03444,I2832835c

* changes:
  [WifiCandidates] Simplify CandidateScorer
  [WifiCandidates] More flexible UCS
  Wifi network selection tuneup

2 files changed, 3 insertions, 8 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java b/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java
index 0f0d33a60..037fd14ab 100644
--- a/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java
@@ -166,8 +166,8 @@ public class CandidateScorerTest extends WifiBaseTest {
      */
     @Test
     public void testPreferTheCurrentNetworkEvenIfRssiDifferenceIsSignificant() throws Exception {
-        assertThat(evaluate(mCandidate1.setScanRssi(-77).setCurrentNetwork(true)),
-                greaterThan(evaluate(mCandidate2.setScanRssi(-68))));
+        assertThat(evaluate(mCandidate1.setScanRssi(-74).setCurrentNetwork(true)),
+                greaterThan(evaluate(mCandidate2.setScanRssi(-65))));
     }
 
     /**
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
index 6dac7fe22..adb1be81c 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
@@ -1480,12 +1480,7 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
                 @Override
                 public WifiCandidates.ScoredCandidate scoreCandidates(
                         Collection<WifiCandidates.Candidate> group) {
-                    return new WifiCandidates.ScoredCandidate(0, 0, null);
-                }
-
-                @Override
-                public boolean userConnectChoiceOverrideWanted() {
-                    return false;
+                    return new WifiCandidates.ScoredCandidate(0, 0, false, null);
                 }
             };