rename evaluator to nominator

Bug: 141019662
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: I96ef09f508d341d605c302f50d118b7958e2e203

8 files changed, 81 insertions, 80 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNominatorTest.java
index f9b53a17a..bf576be14 100644
--- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNominatorTest.java
@@ -57,7 +57,7 @@ import java.util.Map;
  * Unit tests for CarrierNeteworkEvaluator
  */
 @SmallTest
-public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
+public class CarrierNetworkNominatorTest extends WifiBaseTest {
     private static final String CARRIER1_SSID = "\"carrier1\"";
     private static final String CARRIER2_SSID = "\"carrier2\"";
     private static final String CARRIER_SAVED_SSID = "\"carrier3-saved\"";
@@ -71,13 +71,13 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
     private static final int CARRIER_SAVED_EPH_NET_ID = 4;
     private static final int NON_CARRIER_NET_ID = 5;
 
-    private CarrierNetworkEvaluator mDut;
+    private CarrierNetworkNominator mDut;
 
     @Mock private WifiConfigManager mWifiConfigManager;
     @Mock private CarrierNetworkConfig mCarrierNetworkConfig;
     @Mock private LocalLog mLocalLog;
     @Mock private Clock mClock;
-    @Mock private WifiNetworkSelector.NetworkEvaluator.OnConnectableListener mConnectableListener;
+    @Mock private WifiNetworkSelector.NetworkNominator.OnConnectableListener mConnectableListener;
     @Mock private WifiInjector mWifiInjector;
     @Mock private TelephonyManager mTelephonyManager;
     @Mock private TelephonyManager mDataTelephonyManager;
@@ -155,7 +155,7 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
 
-        mDut = new CarrierNetworkEvaluator(mWifiConfigManager, mCarrierNetworkConfig, mLocalLog,
+        mDut = new CarrierNetworkNominator(mWifiConfigManager, mCarrierNetworkConfig, mLocalLog,
                 mWifiInjector);
 
         when(mWifiInjector.makeTelephonyManager()).thenReturn(mTelephonyManager);
@@ -220,7 +220,7 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
         configureNewSsid(CARRIER_SAVED_EPH_NET_ID, scanDetails.get(3), true, false);
         configureNewSsid(NON_CARRIER_NET_ID, scanDetails.get(4), false, true);
 
-        mDut.evaluateNetworks(scanDetails, null, null, false, false,
+        mDut.nominateNetworks(scanDetails, null, null, false, false,
                 mConnectableListener);
 
         verify(mConnectableListener, times(4)).onConnectable(mScanDetailCaptor.capture(),
@@ -273,7 +273,7 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
                 freqs, caps, levels, mClock);
         configureNewSsid(NON_CARRIER_NET_ID, scanDetails.get(0), false, true);
 
-        mDut.evaluateNetworks(scanDetails, null, null, false, false,
+        mDut.nominateNetworks(scanDetails, null, null, false, false,
                 mConnectableListener);
 
         verify(mConnectableListener, never()).onConnectable(any(), any());
@@ -305,7 +305,7 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
         configureNewSsid(CARRIER_SAVED_EPH_NET_ID, scanDetails.get(3), true, false);
         configureNewSsid(NON_CARRIER_NET_ID, scanDetails.get(4), false, true);
 
-        mDut.evaluateNetworks(scanDetails, null, null, false, false,
+        mDut.nominateNetworks(scanDetails, null, null, false, false,
                 mConnectableListener);
 
         verify(mConnectableListener, never()).onConnectable(any(), any());
@@ -333,7 +333,7 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
                 freqs, caps, levels, mClock);
         configureNewSsid(CARRIER1_NET_ID, scanDetails.get(0), true, false);
 
-        mDut.evaluateNetworks(scanDetails, null, null, false, false,
+        mDut.nominateNetworks(scanDetails, null, null, false, false,
                 mConnectableListener);
 
         verify(mConnectableListener, never()).onConnectable(any(), any());
@@ -367,7 +367,7 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
         when(mWifiConfigManager.tryEnableNetwork(CARRIER1_NET_ID))
                 .thenReturn(false);
 
-        mDut.evaluateNetworks(scanDetails, null, null, false, false,
+        mDut.nominateNetworks(scanDetails, null, null, false, false,
                 mConnectableListener);
         verify(mWifiConfigManager).getConfiguredNetwork(eq(blacklisted.getKey()));
 
@@ -395,7 +395,7 @@ public class CarrierNetworkEvaluatorTest extends WifiBaseTest {
         WifiConfiguration carrierConfig = configureNewSsid(CARRIER1_NET_ID, scanDetails.get(0),
                 true, false);
 
-        mDut.evaluateNetworks(scanDetails, null, null, false, false,
+        mDut.nominateNetworks(scanDetails, null, null, false, false,
                 mConnectableListener);
 
         verify(mConnectableListener).onConnectable(any(), mWifiConfigCaptor.capture());
diff --git a/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java b/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java
index 832daf30e..971ac3b4b 100644
--- a/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java
+++ b/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java
@@ -59,8 +59,8 @@ public final class ConcreteCandidate implements WifiCandidates.Candidate {
         mIsEphemeral = candidate.isEphemeral();
         mIsTrusted = candidate.isTrusted();
         mIsMetered = candidate.isMetered();
-        mEvaluatorId = candidate.getEvaluatorId();
-        mEvaluatorScore = candidate.getEvaluatorScore();
+        mEvaluatorId = candidate.getNominatorId();
+        mEvaluatorScore = candidate.getNominatorScore();
         mLastSelectionWeight = candidate.getLastSelectionWeight();
         mScanRssi = candidate.getScanRssi();
         mFrequency = candidate.getFrequency();
@@ -159,7 +159,7 @@ public final class ConcreteCandidate implements WifiCandidates.Candidate {
     }
 
     @Override
-    public int getEvaluatorId() {
+    public int getNominatorId() {
         return mEvaluatorId;
     }
 
@@ -169,7 +169,7 @@ public final class ConcreteCandidate implements WifiCandidates.Candidate {
     }
 
     @Override
-    public int getEvaluatorScore() {
+    public int getNominatorScore() {
         return mEvaluatorScore;
     }
 
diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java
index 16fbd09d2..2e280765d 100644
--- a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java
@@ -51,7 +51,7 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * Unit tests for {@link com.android.server.wifi.NetworkSuggestionEvaluator}.
+ * Unit tests for {@link NetworkSuggestionNominator}.
  */
 @SmallTest
 public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
@@ -64,14 +64,14 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
     private @Mock WifiConfigManager mWifiConfigManager;
     private @Mock WifiNetworkSuggestionsManager mWifiNetworkSuggestionsManager;
     private @Mock Clock mClock;
-    private NetworkSuggestionEvaluator mNetworkSuggestionEvaluator;
+    private NetworkSuggestionNominator mNetworkSuggestionEvaluator;
 
     /** Sets up test. */
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
 
-        mNetworkSuggestionEvaluator = new NetworkSuggestionEvaluator(
+        mNetworkSuggestionEvaluator = new NetworkSuggestionNominator(
                 mWifiNetworkSuggestionsManager, mWifiConfigManager, new LocalLog(100));
     }
 
@@ -102,7 +102,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
         linkScanDetailsWithNetworkSuggestions(scanDetails, suggestions);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -140,7 +140,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
         setupAddToWifiConfigManager(suggestions[0].wns.wifiConfiguration);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -182,7 +182,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 suggestions[1].wns.wifiConfiguration);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -225,7 +225,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 suggestions[1].wns.wifiConfiguration);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -269,7 +269,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 suggestions[1].wns.wifiConfiguration, suggestions[2].wns.wifiConfiguration);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -324,7 +324,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 suggestions[3].wns.wifiConfiguration);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -368,7 +368,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 .thenReturn(new NetworkUpdateResult(INVALID_NETWORK_ID));
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -422,7 +422,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 .thenReturn(suggestions[0].wns.wifiConfiguration);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -477,7 +477,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
         when(mWifiConfigManager.wasEphemeralNetworkDeleted(suggestionSsids[0])).thenReturn(true);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) ->
                         connectableNetworks.add(Pair.create(scanDetail, configuration)));
@@ -530,7 +530,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 .thenReturn(suggestions[0].wns.wifiConfiguration);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
@@ -595,7 +595,7 @@ public class NetworkSuggestionEvaluatorTest extends WifiBaseTest {
                 .thenReturn(true);
 
         List<Pair<ScanDetail, WifiConfiguration>> connectableNetworks = new ArrayList<>();
-        mNetworkSuggestionEvaluator.evaluateNetworks(
+        mNetworkSuggestionEvaluator.nominateNetworks(
                 Arrays.asList(scanDetails), null, null, true, false,
                 (ScanDetail scanDetail, WifiConfiguration configuration) -> {
                     connectableNetworks.add(Pair.create(scanDetail, configuration));
diff --git a/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/SavedNetworkNominatorTest.java
index e34786997..af4267564 100644
--- a/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SavedNetworkNominatorTest.java
@@ -25,7 +25,7 @@ import android.net.wifi.WifiConfiguration;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.LocalLog;
 
-import com.android.server.wifi.WifiNetworkSelector.NetworkEvaluator.OnConnectableListener;
+import com.android.server.wifi.WifiNetworkSelector.NetworkNominator.OnConnectableListener;
 import com.android.server.wifi.WifiNetworkSelectorTestUtil.ScanDetailsAndWifiConfigs;
 import com.android.server.wifi.util.TelephonyUtil;
 
@@ -39,10 +39,10 @@ import org.mockito.MockitoAnnotations;
 import java.util.List;
 
 /**
- * Unit tests for {@link com.android.server.wifi.SavedNetworkEvaluator}.
+ * Unit tests for {@link SavedNetworkNominator}.
  */
 @SmallTest
-public class SavedNetworkEvaluatorTest extends WifiBaseTest {
+public class SavedNetworkNominatorTest extends WifiBaseTest {
 
     /** Sets up test. */
     @Before
@@ -50,7 +50,7 @@ public class SavedNetworkEvaluatorTest extends WifiBaseTest {
         MockitoAnnotations.initMocks(this);
         mLocalLog = new LocalLog(512);
 
-        mSavedNetworkEvaluator = new SavedNetworkEvaluator(mWifiConfigManager, mLocalLog,
+        mSavedNetworkEvaluator = new SavedNetworkNominator(mWifiConfigManager, mLocalLog,
                 mTelephonyUtil);
     }
 
@@ -66,7 +66,7 @@ public class SavedNetworkEvaluatorTest extends WifiBaseTest {
     private static final int TEST_CARRIER_ID = 100;
     private static final int RSSI_LEVEL = -50;
 
-    private SavedNetworkEvaluator mSavedNetworkEvaluator;
+    private SavedNetworkNominator mSavedNetworkEvaluator;
     @Mock private WifiConfigManager mWifiConfigManager;
     @Mock private Clock mClock;
     @Mock private OnConnectableListener mOnConnectableListener;
@@ -94,7 +94,7 @@ public class SavedNetworkEvaluatorTest extends WifiBaseTest {
             wifiConfiguration.useExternalScores = true;
         }
 
-        mSavedNetworkEvaluator.evaluateNetworks(scanDetails,
+        mSavedNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, true, false, mOnConnectableListener);
 
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -121,7 +121,7 @@ public class SavedNetworkEvaluatorTest extends WifiBaseTest {
                 .thenReturn(INVALID_SUBID);
         when(mTelephonyUtil.isSimPresent(eq(INVALID_SUBID))).thenReturn(false);
 
-        mSavedNetworkEvaluator.evaluateNetworks(scanDetails,
+        mSavedNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, true, false, mOnConnectableListener);
 
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -148,7 +148,7 @@ public class SavedNetworkEvaluatorTest extends WifiBaseTest {
             wifiConfiguration.ephemeral = true;
         }
 
-        mSavedNetworkEvaluator.evaluateNetworks(scanDetails,
+        mSavedNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, true, false, mOnConnectableListener);
 
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -173,13 +173,13 @@ public class SavedNetworkEvaluatorTest extends WifiBaseTest {
         List<ScanDetail> scanDetails = scanDetailsAndConfigs.getScanDetails();
         WifiConfiguration[] savedConfigs = scanDetailsAndConfigs.getWifiConfigs();
 
-        mSavedNetworkEvaluator.evaluateNetworks(scanDetails,
+        mSavedNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, true, false, mOnConnectableListener);
 
         verify(mOnConnectableListener, times(2)).onConnectable(any(), any());
         reset(mOnConnectableListener);
         savedConfigs[1].allowAutojoin = false;
-        mSavedNetworkEvaluator.evaluateNetworks(scanDetails,
+        mSavedNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, true, false, mOnConnectableListener);
         verify(mOnConnectableListener).onConnectable(any(),
                 mWifiConfigurationArgumentCaptor.capture());
@@ -208,7 +208,7 @@ public class SavedNetworkEvaluatorTest extends WifiBaseTest {
             wifiConfiguration.allowAutojoin = false;
         }
 
-        mSavedNetworkEvaluator.evaluateNetworks(scanDetails,
+        mSavedNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, true, false, mOnConnectableListener);
 
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
diff --git a/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/ScoredNetworkNominatorTest.java
index 2414b684c..3b7329002 100644
--- a/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/ScoredNetworkNominatorTest.java
@@ -41,7 +41,7 @@ import android.util.LocalLog;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.server.wifi.WifiNetworkSelector.NetworkEvaluator.OnConnectableListener;
+import com.android.server.wifi.WifiNetworkSelector.NetworkNominator.OnConnectableListener;
 import com.android.server.wifi.WifiNetworkSelectorTestUtil.ScanDetailsAndWifiConfigs;
 import com.android.server.wifi.util.WifiPermissionsUtil;
 
@@ -57,10 +57,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Unit tests for {@link ScoredNetworkEvaluator}.
+ * Unit tests for {@link ScoredNetworkNominator}.
  */
 @SmallTest
-public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
+public class ScoredNetworkNominatorTest extends WifiBaseTest {
     private static final String TEST_PACKAGE_NAME = "name.package.test";
     private static final int TEST_UID = 12345;
     private static final NetworkScorerAppData TEST_APP_DATA = new NetworkScorerAppData(
@@ -81,7 +81,7 @@ public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
     @Captor private ArgumentCaptor<WifiConfiguration> mWifiConfigCaptor;
 
     private WifiNetworkScoreCache mScoreCache;
-    private ScoredNetworkEvaluator mScoredNetworkEvaluator;
+    private ScoredNetworkNominator mScoredNetworkEvaluator;
 
     @Before
     public void setUp() throws Exception {
@@ -101,7 +101,7 @@ public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
         ArgumentCaptor<ContentObserver> observerCaptor =
                 ArgumentCaptor.forClass(ContentObserver.class);
         mScoreCache = new WifiNetworkScoreCache(mContext);
-        mScoredNetworkEvaluator = new ScoredNetworkEvaluator(mContext,
+        mScoredNetworkEvaluator = new ScoredNetworkNominator(mContext,
                 new Handler(Looper.getMainLooper()), mFrameworkFacade, mNetworkScoreManager,
                 mPackageManager, mWifiConfigManager, new LocalLog(0), mScoreCache,
                 mWifiPermissionsUtil);
@@ -228,7 +228,7 @@ public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
 
         mContentObserver.onChange(false /* unused */);
 
-        mScoredNetworkEvaluator.evaluateNetworks(null, null, null, false, false,
+        mScoredNetworkEvaluator.nominateNetworks(null, null, null, false, false,
                 mOnConnectableListener);
 
         verifyZeroInteractions(mWifiConfigManager, mNetworkScoreManager);
@@ -307,7 +307,7 @@ public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
         when(mWifiConfigManager.addOrUpdateNetwork(any(), anyInt()))
                 .thenReturn(new NetworkUpdateResult(1));
         // Untrusted networks allowed.
-        mScoredNetworkEvaluator.evaluateNetworks(scanDetails,
+        mScoredNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, false, true, mOnConnectableListener);
         verify(mOnConnectableListener, atLeastOnce())
                 .onConnectable(any(), mWifiConfigCaptor.capture());
@@ -342,7 +342,7 @@ public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
                 mWifiConfigManager, 1, scanDetails.get(1), meteredHints[1]);
 
         // Untrusted networks not allowed.
-        mScoredNetworkEvaluator.evaluateNetworks(scanDetails,
+        mScoredNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, false, false, mOnConnectableListener);
 
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -372,7 +372,7 @@ public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
         WifiNetworkSelectorTestUtil.configureScoreCache(mScoreCache,
                 scanDetails, scores, meteredHints);
 
-        mScoredNetworkEvaluator.evaluateNetworks(scanDetails,
+        mScoredNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, false, true, mOnConnectableListener);
 
         verify(mOnConnectableListener).onConnectable(any(), mWifiConfigCaptor.capture());
@@ -404,7 +404,7 @@ public class ScoredNetworkEvaluatorTest extends WifiBaseTest {
         WifiNetworkSelectorTestUtil.configureScoreCache(mScoreCache,
                 scanDetails, scores, meteredHints);
 
-        mScoredNetworkEvaluator.evaluateNetworks(scanDetails,
+        mScoredNetworkEvaluator.nominateNetworks(scanDetails,
                 null, null, false, true, mOnConnectableListener);
 
         verify(mOnConnectableListener).onConnectable(any(), mWifiConfigCaptor.capture());
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java
index 65bedc476..386a83115 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java
@@ -279,7 +279,7 @@ public class WifiCandidatesTest extends WifiBaseTest {
         // Make sure we kept the one with a higher evaluatorScore
         WifiCandidates.Candidate c;
         c = mWifiCandidates.getGroupedCandidates().iterator().next().iterator().next();
-        assertEquals(15, c.getEvaluatorScore());
         assertEquals(90, c.getPredictedThroughputMbps());
+        assertEquals(15, c.getNominatorScore());
     }
 }
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
index 6ef7c08b3..039fb9920 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
@@ -92,7 +92,7 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
                 mWifiNative,
                 mThroughputPredictor
         );
-        mWifiNetworkSelector.registerNetworkEvaluator(mDummyEvaluator);
+        mWifiNetworkSelector.registerNetworkNominator(mDummyEvaluator);
         mDummyEvaluator.setEvaluatorToSelectCandidate(true);
         when(mClock.getElapsedSinceBootMillis()).thenReturn(SystemClock.elapsedRealtime());
         when(mCarrierNetworkConfig.isCarrierNetwork(any())).thenReturn(true);
@@ -113,7 +113,7 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
     /**
      * All this dummy network evaluator does is to pick the specified network in the scan results.
      */
-    public class DummyNetworkEvaluator implements WifiNetworkSelector.NetworkEvaluator {
+    public class DummyNetworkNominator implements WifiNetworkSelector.NetworkNominator {
         private static final String NAME = "DummyNetworkEvaluator";
 
         private boolean mEvaluatorShouldSelectCandidate = true;
@@ -121,12 +121,12 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
         private int mNetworkIndexToReturn;
         private int mEvaluatorIdToReturn;
 
-        public DummyNetworkEvaluator(int networkIndexToReturn, int evaluatorIdToReturn) {
+        public DummyNetworkNominator(int networkIndexToReturn, int evaluatorIdToReturn) {
             mNetworkIndexToReturn = networkIndexToReturn;
             mEvaluatorIdToReturn = evaluatorIdToReturn;
         }
 
-        public DummyNetworkEvaluator() {
+        public DummyNetworkNominator() {
             this(0, DUMMY_EVALUATOR_ID_1);
         }
 
@@ -139,7 +139,7 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
         }
 
         @Override
-        public @EvaluatorId int getId() {
+        public @NominatorId int getId() {
             return mEvaluatorIdToReturn;
         }
 
@@ -166,7 +166,7 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
          * {@link WifiNetworkSelectorTestUtil#setupScanDetailsAndConfigStore}.
          */
         @Override
-        public void evaluateNetworks(List<ScanDetail> scanDetails,
+        public void nominateNetworks(List<ScanDetail> scanDetails,
                     WifiConfiguration currentNetwork, String currentBssid, boolean connected,
                     boolean untrustedNetworkAllowed,
                     @NonNull OnConnectableListener onConnectableListener) {
@@ -189,7 +189,7 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
     }
 
     private WifiNetworkSelector mWifiNetworkSelector = null;
-    private DummyNetworkEvaluator mDummyEvaluator = new DummyNetworkEvaluator();
+    private DummyNetworkNominator mDummyEvaluator = new DummyNetworkNominator();
     @Mock private WifiConfigManager mWifiConfigManager;
     @Mock private Context mContext;
     @Mock private CarrierNetworkConfig mCarrierNetworkConfig;
@@ -793,11 +793,11 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
     public void testMultipleEvaluatorsSetsNominatorIdCorrectly() {
         // first dummy evaluator is registered in setup, returns index 0
         // register a second network evaluator that also returns index 0, but with a different ID
-        mWifiNetworkSelector.registerNetworkEvaluator(new DummyNetworkEvaluator(0,
-                WifiNetworkSelector.NetworkEvaluator.EVALUATOR_ID_SCORED));
+        mWifiNetworkSelector.registerNetworkNominator(new DummyNetworkNominator(0,
+                WifiNetworkSelector.NetworkNominator.NOMINATOR_ID_SCORED));
         // register a third network evaluator that also returns index 0, but with a different ID
-        mWifiNetworkSelector.registerNetworkEvaluator(new DummyNetworkEvaluator(0,
-                WifiNetworkSelector.NetworkEvaluator.EVALUATOR_ID_SAVED));
+        mWifiNetworkSelector.registerNetworkNominator(new DummyNetworkNominator(0,
+                WifiNetworkSelector.NetworkNominator.NOMINATOR_ID_SAVED));
 
         String[] ssids = {"\"test1\"", "\"test2\""};
         String[] bssids = {"6c:f3:7f:ae:8c:f3", "6c:f3:7f:ae:8c:f4"};
@@ -1461,8 +1461,8 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
         mWifiNetworkSelector.registerCandidateScorer(NULL_SCORER);
 
         // add a second NetworkEvaluator that returns the second network in the scan list
-        mWifiNetworkSelector.registerNetworkEvaluator(
-                new DummyNetworkEvaluator(1, DUMMY_EVALUATOR_ID_2));
+        mWifiNetworkSelector.registerNetworkNominator(
+                new DummyNetworkNominator(1, DUMMY_EVALUATOR_ID_2));
 
         int compatibilityExpId = experimentIdFromIdentifier(mCompatibilityScorer.getIdentifier());
         mScoringParams.update("expid=" + compatibilityExpId);
@@ -1489,17 +1489,18 @@ public class WifiNetworkSelectorTest extends WifiBaseTest {
         mWifiNetworkSelector.registerCandidateScorer(mThroughputScorer);
 
         // add a second NetworkEvaluator that returns the second network in the scan list
-        mWifiNetworkSelector.registerNetworkEvaluator(
-                new DummyNetworkEvaluator(1, DUMMY_EVALUATOR_ID_2));
+        mWifiNetworkSelector.registerNetworkNominator(
+                new DummyNetworkNominator(1, DUMMY_EVALUATOR_ID_2));
 
         test2GhzHighQuality5GhzAvailable();
 
         int throughputExpId = experimentIdFromIdentifier(mThroughputScorer.getIdentifier());
+        int compatibilityExpId = experimentIdFromIdentifier(mCompatibilityScorer.getIdentifier());
 
         // Wanted 2 times since test2GhzHighQuality5GhzAvailable() calls
         // WifiNetworkSelector.selectNetwork() twice
         verify(mWifiMetrics, times(2)).logNetworkSelectionDecision(throughputExpId,
-                WifiNetworkSelector.LEGACY_CANDIDATE_SCORER_EXP_ID, true, 2);
+                compatibilityExpId, true, 2);
     }
 
     /**
diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkNominatorTest.java
index a11c05b8c..d6e05a875 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkNominatorTest.java
@@ -49,7 +49,7 @@ import com.android.server.wifi.ScanDetail;
 import com.android.server.wifi.WifiConfigManager;
 import com.android.server.wifi.WifiConfigurationTestUtil;
 import com.android.server.wifi.WifiInjector;
-import com.android.server.wifi.WifiNetworkSelector.NetworkEvaluator.OnConnectableListener;
+import com.android.server.wifi.WifiNetworkSelector.NetworkNominator.OnConnectableListener;
 import com.android.server.wifi.util.ScanResultUtil;
 import com.android.server.wifi.util.TelephonyUtil;
 
@@ -63,10 +63,10 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * Unit tests for {@link com.android.server.wifi.hotspot2.PasspointNetworkEvaluator}.
+ * Unit tests for {@link PasspointNetworkNominator}.
  */
 @SmallTest
-public class PasspointNetworkEvaluatorTest {
+public class PasspointNetworkNominatorTest {
     // TODO(b/140763176): should extend WifiBaseTest, but if it does then it fails with NPE
     private static final int TEST_NETWORK_ID = 1;
     private static final String TEST_SSID1 = "ssid1";
@@ -90,7 +90,7 @@ public class PasspointNetworkEvaluatorTest {
     @Mock CarrierNetworkConfig mCarrierNetworkConfig;
     @Mock WifiInjector mWifiInjector;
     LocalLog mLocalLog;
-    PasspointNetworkEvaluator mEvaluator;
+    PasspointNetworkNominator mEvaluator;
 
     /**
      * Helper function for generating {@link WifiConfiguration} for testing.
@@ -151,7 +151,7 @@ public class PasspointNetworkEvaluatorTest {
     public void setUp() throws Exception {
         initMocks(this);
         mLocalLog = new LocalLog(512);
-        mEvaluator = new PasspointNetworkEvaluator(mPasspointManager, mWifiConfigManager, mLocalLog,
+        mEvaluator = new PasspointNetworkNominator(mPasspointManager, mWifiConfigManager, mLocalLog,
                 mWifiInjector, mSubscriptionManager);
         // SIM is present
         when(mSubscriptionManager.getActiveSubscriptionInfoList())
@@ -168,7 +168,7 @@ public class PasspointNetworkEvaluatorTest {
                 generateScanDetail(TEST_SSID1, TEST_BSSID1),
                 generateScanDetail(TEST_SSID2, TEST_BSSID2)});
         when(mPasspointManager.matchProvider(any(ScanResult.class))).thenReturn(null);
-        mEvaluator.evaluateNetworks(
+        mEvaluator.nominateNetworks(
                 scanDetails, null, null, false, false, mOnConnectableListener);
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
     }
@@ -187,7 +187,7 @@ public class PasspointNetworkEvaluatorTest {
         when(scanDetail.getNetworkDetail()).thenReturn(networkDetail);
 
         List<ScanDetail> scanDetails = Arrays.asList(new ScanDetail[] {scanDetail});
-        mEvaluator.evaluateNetworks(
+        mEvaluator.nominateNetworks(
                 scanDetails, null, null, false, false, mOnConnectableListener);
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
         // Verify that no provider matching is performed.
@@ -217,7 +217,7 @@ public class PasspointNetworkEvaluatorTest {
         when(mWifiConfigManager.addOrUpdateNetwork(any(WifiConfiguration.class), anyInt()))
                 .thenReturn(new NetworkUpdateResult(TEST_NETWORK_ID));
         when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID)).thenReturn(TEST_CONFIG1);
-        mEvaluator.evaluateNetworks(scanDetails, null, null, false,
+        mEvaluator.nominateNetworks(scanDetails, null, null, false,
                 false, mOnConnectableListener);
         verify(mOnConnectableListener).onConnectable(any(), any());
 
@@ -259,7 +259,7 @@ public class PasspointNetworkEvaluatorTest {
         when(mWifiConfigManager.addOrUpdateNetwork(any(WifiConfiguration.class), anyInt()))
                 .thenReturn(new NetworkUpdateResult(TEST_NETWORK_ID));
         when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID)).thenReturn(TEST_CONFIG1);
-        mEvaluator.evaluateNetworks(scanDetails, null, null, false,
+        mEvaluator.nominateNetworks(scanDetails, null, null, false,
                 false, mOnConnectableListener);
         verify(mOnConnectableListener).onConnectable(any(), any());
 
@@ -308,7 +308,7 @@ public class PasspointNetworkEvaluatorTest {
         when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID)).thenReturn(TEST_CONFIG1);
         when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID + 1))
                 .thenReturn(TEST_CONFIG2);
-        mEvaluator.evaluateNetworks(scanDetails, null, null, false,
+        mEvaluator.nominateNetworks(scanDetails, null, null, false,
                 false, mOnConnectableListener);
         verify(mOnConnectableListener, times(2)).onConnectable(any(), any());
 
@@ -343,7 +343,7 @@ public class PasspointNetworkEvaluatorTest {
                 .thenReturn(new NetworkUpdateResult(TEST_NETWORK_ID));
         when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID)).thenReturn(config);
 
-        mEvaluator.evaluateNetworks(scanDetails, null, null, false,
+        mEvaluator.nominateNetworks(scanDetails, null, null, false,
                 false, mOnConnectableListener);
         verify(mOnConnectableListener).onConnectable(any(),
                 mWifiConfigurationArgumentCaptor.capture());
@@ -379,7 +379,7 @@ public class PasspointNetworkEvaluatorTest {
                 .thenReturn(new NetworkUpdateResult(TEST_NETWORK_ID));
         when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID)).thenReturn(currentNetwork);
 
-        mEvaluator.evaluateNetworks(scanDetails, currentNetwork,
+        mEvaluator.nominateNetworks(scanDetails, currentNetwork,
                 currentBssid, true, false, mOnConnectableListener);
 
         verify(mOnConnectableListener).onConnectable(any(), any());
@@ -428,7 +428,7 @@ public class PasspointNetworkEvaluatorTest {
                 .thenReturn(null);
         when(mWifiConfigManager.getConfiguredNetwork(anyString())).thenReturn(disableConfig);
 
-        mEvaluator.evaluateNetworks(scanDetails, null, null, false,
+        mEvaluator.nominateNetworks(scanDetails, null, null, false,
                 false, mOnConnectableListener);
         verify(mWifiConfigManager, never()).addOrUpdateNetwork(any(WifiConfiguration.class),
                 anyInt());
@@ -455,7 +455,7 @@ public class PasspointNetworkEvaluatorTest {
         when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID)).thenReturn(TEST_CONFIG1);
         when(mWifiConfigManager.wasEphemeralNetworkDeleted("\"" + TEST_SSID1 + "\""))
                 .thenReturn(true);
-        mEvaluator.evaluateNetworks(
+        mEvaluator.nominateNetworks(
                 scanDetails, null, null, false, false, mOnConnectableListener);
         verify(mOnConnectableListener, never()).onConnectable(any(), any());
     }