WifiNetworkSelector evaluators are now nominators
Fix the remaining references to evaluators. No functional changes.
Bug: 147751334
Test: atest com.android.server.wifi
Change-Id: I85c5d0f8f35117231889daedb26c20edb9a21968
diff --git a/service/java/com/android/server/wifi/CompatibilityScorer.java b/service/java/com/android/server/wifi/CompatibilityScorer.java
index f2ec5b9..996324b 100644
--- a/service/java/com/android/server/wifi/CompatibilityScorer.java
+++ b/service/java/com/android/server/wifi/CompatibilityScorer.java
@@ -97,7 +97,7 @@
}
// To simulate the old strict priority rule, subtract a penalty based on
- // which evaluator added the candidate.
+ // which nominator added the candidate.
score -= 1000 * candidate.getNominatorId();
// The old method breaks ties on the basis of RSSI, which we can
diff --git a/service/java/com/android/server/wifi/ScoreCardBasedScorer.java b/service/java/com/android/server/wifi/ScoreCardBasedScorer.java
index e8617e1..3ced720 100644
--- a/service/java/com/android/server/wifi/ScoreCardBasedScorer.java
+++ b/service/java/com/android/server/wifi/ScoreCardBasedScorer.java
@@ -105,7 +105,7 @@
}
// To simulate the old strict priority rule, subtract a penalty based on
- // which evaluator added the candidate.
+ // which nominator added the candidate.
score -= 1000 * candidate.getNominatorId();
return new ScoredCandidate(score, 10,
diff --git a/service/java/com/android/server/wifi/WifiCandidates.java b/service/java/com/android/server/wifi/WifiCandidates.java
index 1329601..ded873f 100644
--- a/service/java/com/android/server/wifi/WifiCandidates.java
+++ b/service/java/com/android/server/wifi/WifiCandidates.java
@@ -86,14 +86,14 @@
*/
boolean isMetered();
/**
- * Returns the ID of the evaluator that provided the candidate.
+ * Returns the ID of the nominator that provided the candidate.
*/
@WifiNetworkSelector.NetworkNominator.NominatorId
int getNominatorId();
/**
- * Gets the score that was provided by the evaluator.
+ * Gets the score that was provided by the nominator.
*
- * Not all evaluators provide a useful score. Scores from different evaluators
+ * Not all nominators provide a useful score. Scores from different nominators
* are not directly comparable.
*/
int getNominatorScore();
@@ -134,13 +134,13 @@
/**
* Represents a connectable candidate
*/
- static class CandidateImpl implements Candidate {
+ private static class CandidateImpl implements Candidate {
public final Key key; // SSID/sectype/BSSID/configId
public final ScanDetail scanDetail;
public final WifiConfiguration config;
- // First evaluator to nominate this config
- public final @WifiNetworkSelector.NetworkNominator.NominatorId int evaluatorId;
- public final int evaluatorScore; // Score provided by first nominating evaluator
+ // First nominator to nominate this config
+ public final @WifiNetworkSelector.NetworkNominator.NominatorId int nominatorId;
+ public final int nominatorScore; // Score provided by first nominator
public final double lastSelectionWeight; // Value between 0 and 1
private WifiScoreCard.PerBssid mPerBssid; // For accessing the scorecard entry
@@ -152,8 +152,8 @@
CandidateImpl(Key key,
ScanDetail scanDetail,
WifiConfiguration config,
- @WifiNetworkSelector.NetworkNominator.NominatorId int evaluatorId,
- int evaluatorScore,
+ @WifiNetworkSelector.NetworkNominator.NominatorId int nominatorId,
+ int nominatorScore,
WifiScoreCard.PerBssid perBssid,
double lastSelectionWeight,
boolean isCurrentNetwork,
@@ -163,8 +163,8 @@
this.key = key;
this.scanDetail = scanDetail;
this.config = config;
- this.evaluatorId = evaluatorId;
- this.evaluatorScore = evaluatorScore;
+ this.nominatorId = nominatorId;
+ this.nominatorScore = nominatorScore;
this.mPerBssid = perBssid;
this.lastSelectionWeight = lastSelectionWeight;
this.mIsCurrentNetwork = isCurrentNetwork;
@@ -216,12 +216,12 @@
@Override
public @WifiNetworkSelector.NetworkNominator.NominatorId int getNominatorId() {
- return evaluatorId;
+ return nominatorId;
}
@Override
public int getNominatorScore() {
- return evaluatorScore;
+ return nominatorScore;
}
@Override
@@ -373,8 +373,8 @@
*/
public boolean add(ScanDetail scanDetail,
WifiConfiguration config,
- @WifiNetworkSelector.NetworkNominator.NominatorId int evaluatorId,
- int evaluatorScore,
+ @WifiNetworkSelector.NetworkNominator.NominatorId int nominatorId,
+ int nominatorScore,
double lastSelectionWeightBetweenZeroAndOne,
boolean isMetered,
int predictedThroughputMbps) {
@@ -400,9 +400,9 @@
CandidateImpl old = mCandidates.get(key);
if (old != null) {
// check if we want to replace this old candidate
- if (evaluatorId < old.evaluatorId) return failure();
- if (evaluatorId > old.evaluatorId) return false;
- if (evaluatorScore <= old.evaluatorScore) return false;
+ if (nominatorId < old.nominatorId) return failure();
+ if (nominatorId > old.nominatorId) return false;
+ if (nominatorScore <= old.nominatorScore) return false;
remove(old);
}
WifiScoreCard.PerBssid perBssid = mWifiScoreCard.lookupBssid(
@@ -412,7 +412,7 @@
WifiScoreCardProto.SecurityType.forNumber(key.matchInfo.networkType));
perBssid.setNetworkConfigId(config.networkId);
CandidateImpl candidate = new CandidateImpl(key,
- scanDetail, config, evaluatorId, evaluatorScore, perBssid,
+ scanDetail, config, nominatorId, nominatorScore, perBssid,
Math.min(Math.max(lastSelectionWeightBetweenZeroAndOne, 0.0), 1.0),
config.networkId == mCurrentNetworkId,
bssid.equals(mCurrentBssid),
diff --git a/service/tests/wifitests/Android.bp b/service/tests/wifitests/Android.bp
index 0b1bcda..ec61983 100644
--- a/service/tests/wifitests/Android.bp
+++ b/service/tests/wifitests/Android.bp
@@ -150,12 +150,6 @@
"com.android.server.wifi.ByteBufferReader",
"com.android.server.wifi.ByteBufferReader$*",
"com.android.server.wifi.ByteBufferReader.**",
- "com.android.server.wifi.CarrierNetworkConfig",
- "com.android.server.wifi.CarrierNetworkConfig$*",
- "com.android.server.wifi.CarrierNetworkConfig.**",
- "com.android.server.wifi.CarrierNetworkEvaluator",
- "com.android.server.wifi.CarrierNetworkEvaluator$*",
- "com.android.server.wifi.CarrierNetworkEvaluator.**",
"com.android.server.wifi.ClientModeImpl",
"com.android.server.wifi.ClientModeImpl$*",
"com.android.server.wifi.ClientModeImpl.**",
@@ -177,6 +171,12 @@
"com.android.server.wifi.ConnectedScore",
"com.android.server.wifi.ConnectedScore$*",
"com.android.server.wifi.ConnectedScore.**",
+ "com.android.server.wifi.ConnectionFailureNotificationBuilder",
+ "com.android.server.wifi.ConnectionFailureNotificationBuilder$*",
+ "com.android.server.wifi.ConnectionFailureNotificationBuilder.**",
+ "com.android.server.wifi.ConnectionFailureNotifier",
+ "com.android.server.wifi.ConnectionFailureNotifier$*",
+ "com.android.server.wifi.ConnectionFailureNotifier.**",
"com.android.server.wifi.DefaultModeManager",
"com.android.server.wifi.DefaultModeManager$*",
"com.android.server.wifi.DefaultModeManager.**",
@@ -192,6 +192,9 @@
"com.android.server.wifi.DummyLogMessage",
"com.android.server.wifi.DummyLogMessage$*",
"com.android.server.wifi.DummyLogMessage.**",
+ "com.android.server.wifi.EapFailureNotifier",
+ "com.android.server.wifi.EapFailureNotifier$*",
+ "com.android.server.wifi.EapFailureNotifier.**",
"com.android.server.wifi.ExtendedWifiInfo",
"com.android.server.wifi.ExtendedWifiInfo$*",
"com.android.server.wifi.ExtendedWifiInfo.**",
@@ -210,6 +213,9 @@
"com.android.server.wifi.IMSIParameter",
"com.android.server.wifi.IMSIParameter$*",
"com.android.server.wifi.IMSIParameter.**",
+ "com.android.server.wifi.ImsiPrivacyProtectionExemptionStoreData",
+ "com.android.server.wifi.ImsiPrivacyProtectionExemptionStoreData$*",
+ "com.android.server.wifi.ImsiPrivacyProtectionExemptionStoreData.**",
"com.android.server.wifi.LastMileLogger",
"com.android.server.wifi.LastMileLogger$*",
"com.android.server.wifi.LastMileLogger.**",
@@ -246,9 +252,9 @@
"com.android.server.wifi.NetworkRequestStoreData",
"com.android.server.wifi.NetworkRequestStoreData$*",
"com.android.server.wifi.NetworkRequestStoreData.**",
- "com.android.server.wifi.NetworkSuggestionEvaluator",
- "com.android.server.wifi.NetworkSuggestionEvaluator$*",
- "com.android.server.wifi.NetworkSuggestionEvaluator.**",
+ "com.android.server.wifi.NetworkSuggestionNominator",
+ "com.android.server.wifi.NetworkSuggestionNominator$*",
+ "com.android.server.wifi.NetworkSuggestionNominator.**",
"com.android.server.wifi.NetworkSuggestionStoreData",
"com.android.server.wifi.NetworkSuggestionStoreData$*",
"com.android.server.wifi.NetworkSuggestionStoreData.**",
@@ -270,9 +276,9 @@
"com.android.server.wifi.SarManager",
"com.android.server.wifi.SarManager$*",
"com.android.server.wifi.SarManager.**",
- "com.android.server.wifi.SavedNetworkEvaluator",
- "com.android.server.wifi.SavedNetworkEvaluator$*",
- "com.android.server.wifi.SavedNetworkEvaluator.**",
+ "com.android.server.wifi.SavedNetworkNominator",
+ "com.android.server.wifi.SavedNetworkNominator$*",
+ "com.android.server.wifi.SavedNetworkNominator.**",
"com.android.server.wifi.ScanDetail",
"com.android.server.wifi.ScanDetail$*",
"com.android.server.wifi.ScanDetail.**",
@@ -288,9 +294,9 @@
"com.android.server.wifi.ScoreCardBasedScorer",
"com.android.server.wifi.ScoreCardBasedScorer$*",
"com.android.server.wifi.ScoreCardBasedScorer.**",
- "com.android.server.wifi.ScoredNetworkEvaluator",
- "com.android.server.wifi.ScoredNetworkEvaluator$*",
- "com.android.server.wifi.ScoredNetworkEvaluator.**",
+ "com.android.server.wifi.ScoredNetworkNominator",
+ "com.android.server.wifi.ScoredNetworkNominator$*",
+ "com.android.server.wifi.ScoredNetworkNominator.**",
"com.android.server.wifi.ScoringParams",
"com.android.server.wifi.ScoringParams$*",
"com.android.server.wifi.ScoringParams.**",
@@ -420,6 +426,9 @@
"com.android.server.wifi.WifiDiagnostics",
"com.android.server.wifi.WifiDiagnostics$*",
"com.android.server.wifi.WifiDiagnostics.**",
+ "com.android.server.wifi.WifiHealthMonitor",
+ "com.android.server.wifi.WifiHealthMonitor$*",
+ "com.android.server.wifi.WifiHealthMonitor.**",
"com.android.server.wifi.WifiInjector",
"com.android.server.wifi.WifiInjector$*",
"com.android.server.wifi.WifiInjector.**",
@@ -465,6 +474,9 @@
"com.android.server.wifi.WifiNetworkSuggestionsManager",
"com.android.server.wifi.WifiNetworkSuggestionsManager$*",
"com.android.server.wifi.WifiNetworkSuggestionsManager.**",
+ "com.android.server.wifi.WifiOemConfigStoreMigrationDataHolder",
+ "com.android.server.wifi.WifiOemConfigStoreMigrationDataHolder$*",
+ "com.android.server.wifi.WifiOemConfigStoreMigrationDataHolder.**",
"com.android.server.wifi.WifiPowerMetrics",
"com.android.server.wifi.WifiPowerMetrics$*",
"com.android.server.wifi.WifiPowerMetrics.**",
@@ -564,9 +576,6 @@
"com.android.server.wifi.hotspot2.AuthMatch",
"com.android.server.wifi.hotspot2.AuthMatch$*",
"com.android.server.wifi.hotspot2.AuthMatch.**",
- "com.android.server.wifi.hotspot2.CertificateVerifier",
- "com.android.server.wifi.hotspot2.CertificateVerifier$*",
- "com.android.server.wifi.hotspot2.CertificateVerifier.**",
"com.android.server.wifi.hotspot2.DomainMatcher",
"com.android.server.wifi.hotspot2.DomainMatcher$*",
"com.android.server.wifi.hotspot2.DomainMatcher.**",
@@ -600,9 +609,9 @@
"com.android.server.wifi.hotspot2.PasspointMatch",
"com.android.server.wifi.hotspot2.PasspointMatch$*",
"com.android.server.wifi.hotspot2.PasspointMatch.**",
- "com.android.server.wifi.hotspot2.PasspointNetworkEvaluator",
- "com.android.server.wifi.hotspot2.PasspointNetworkEvaluator$*",
- "com.android.server.wifi.hotspot2.PasspointNetworkEvaluator.**",
+ "com.android.server.wifi.hotspot2.PasspointNetworkNominateHelper",
+ "com.android.server.wifi.hotspot2.PasspointNetworkNominateHelper$*",
+ "com.android.server.wifi.hotspot2.PasspointNetworkNominateHelper.**",
"com.android.server.wifi.hotspot2.PasspointNetworkScore",
"com.android.server.wifi.hotspot2.PasspointNetworkScore$*",
"com.android.server.wifi.hotspot2.PasspointNetworkScore.**",
@@ -840,6 +849,9 @@
"com.android.server.wifi.util.ApConfigUtil",
"com.android.server.wifi.util.ApConfigUtil$*",
"com.android.server.wifi.util.ApConfigUtil.**",
+ "com.android.server.wifi.util.ArrayUtils",
+ "com.android.server.wifi.util.ArrayUtils$*",
+ "com.android.server.wifi.util.ArrayUtils.**",
"com.android.server.wifi.util.BitMask",
"com.android.server.wifi.util.BitMask$*",
"com.android.server.wifi.util.BitMask.**",
@@ -873,9 +885,15 @@
"com.android.server.wifi.util.IntHistogram",
"com.android.server.wifi.util.IntHistogram$*",
"com.android.server.wifi.util.IntHistogram.**",
+ "com.android.server.wifi.util.IpConfigStore",
+ "com.android.server.wifi.util.IpConfigStore$*",
+ "com.android.server.wifi.util.IpConfigStore.**",
"com.android.server.wifi.util.KalmanFilter",
"com.android.server.wifi.util.KalmanFilter$*",
"com.android.server.wifi.util.KalmanFilter.**",
+ "com.android.server.wifi.util.KeyValueListParser",
+ "com.android.server.wifi.util.KeyValueListParser$*",
+ "com.android.server.wifi.util.KeyValueListParser.**",
"com.android.server.wifi.util.Matrix",
"com.android.server.wifi.util.Matrix$*",
"com.android.server.wifi.util.Matrix.**",
@@ -885,6 +903,9 @@
"com.android.server.wifi.util.NativeUtil",
"com.android.server.wifi.util.NativeUtil$*",
"com.android.server.wifi.util.NativeUtil.**",
+ "com.android.server.wifi.util.NetdWrapper",
+ "com.android.server.wifi.util.NetdWrapper$*",
+ "com.android.server.wifi.util.NetdWrapper.**",
"com.android.server.wifi.util.ObjectCounter",
"com.android.server.wifi.util.ObjectCounter$*",
"com.android.server.wifi.util.ObjectCounter.**",
@@ -918,9 +939,15 @@
"com.android.server.wifi.util.WifiPermissionsWrapper",
"com.android.server.wifi.util.WifiPermissionsWrapper$*",
"com.android.server.wifi.util.WifiPermissionsWrapper.**",
+ "com.android.server.wifi.util.WorkSourceUtil",
+ "com.android.server.wifi.util.WorkSourceUtil$*",
+ "com.android.server.wifi.util.WorkSourceUtil.**",
"com.android.server.wifi.util.XmlUtil",
"com.android.server.wifi.util.XmlUtil$*",
"com.android.server.wifi.util.XmlUtil.**",
+ "com.android.server.wifi.util.XmlUtilHelper",
+ "com.android.server.wifi.util.XmlUtilHelper$*",
+ "com.android.server.wifi.util.XmlUtilHelper.**",
],
},
}
diff --git a/service/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java b/service/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java
index 368ee92..611f292 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/CandidateScorerTest.java
@@ -106,9 +106,9 @@
@Before
public void setUp() throws Exception {
mScoringParams.update("");
- mCandidate1 = new ConcreteCandidate().setEvaluatorId(0).setEvaluatorScore(66)
+ mCandidate1 = new ConcreteCandidate().setNominatorId(0).setNominatorScore(66)
.setScanRssi(-50).setFrequency(5180);
- mCandidate2 = new ConcreteCandidate().setEvaluatorId(0).setEvaluatorScore(99)
+ mCandidate2 = new ConcreteCandidate().setNominatorId(0).setNominatorScore(99)
.setScanRssi(-50).setFrequency(5180);
}
diff --git a/service/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java b/service/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java
index 971ac3b..14ec8d8 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/ConcreteCandidate.java
@@ -35,8 +35,8 @@
private boolean mIsEphemeral;
private boolean mIsTrusted;
private boolean mIsMetered;
- private int mEvaluatorId = -1;
- private int mEvaluatorScore = Integer.MIN_VALUE;
+ private int mNominatorId = -1;
+ private int mNominatorScore = Integer.MIN_VALUE;
private double mLastSelectionWeight;
private int mScanRssi = -127;
private int mFrequency = -1;
@@ -59,8 +59,8 @@
mIsEphemeral = candidate.isEphemeral();
mIsTrusted = candidate.isTrusted();
mIsMetered = candidate.isMetered();
- mEvaluatorId = candidate.getNominatorId();
- mEvaluatorScore = candidate.getNominatorScore();
+ mNominatorId = candidate.getNominatorId();
+ mNominatorScore = candidate.getNominatorScore();
mLastSelectionWeight = candidate.getLastSelectionWeight();
mScanRssi = candidate.getScanRssi();
mFrequency = candidate.getFrequency();
@@ -153,24 +153,24 @@
return mIsMetered;
}
- public ConcreteCandidate setEvaluatorId(int evaluatorId) {
- mEvaluatorId = evaluatorId;
+ public ConcreteCandidate setNominatorId(int nominatorId) {
+ mNominatorId = nominatorId;
return this;
}
@Override
public int getNominatorId() {
- return mEvaluatorId;
+ return mNominatorId;
}
- public ConcreteCandidate setEvaluatorScore(int evaluatorScore) {
- mEvaluatorScore = evaluatorScore;
+ public ConcreteCandidate setNominatorScore(int nominatorScore) {
+ mNominatorScore = nominatorScore;
return this;
}
@Override
public int getNominatorScore() {
- return mEvaluatorScore;
+ return mNominatorScore;
}
public ConcreteCandidate setLastSelectionWeight(double lastSelectionWeight) {
diff --git a/service/tests/wifitests/src/com/android/server/wifi/SavedNetworkNominatorTest.java b/service/tests/wifitests/src/com/android/server/wifi/SavedNetworkNominatorTest.java
index 4e6bd7e..7bd6a06 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/SavedNetworkNominatorTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/SavedNetworkNominatorTest.java
@@ -52,7 +52,7 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mLocalLog = new LocalLog(512);
- mSavedNetworkEvaluator = new SavedNetworkNominator(mWifiConfigManager,
+ mSavedNetworkNominator = new SavedNetworkNominator(mWifiConfigManager,
mPasspointNetworkNominateHelper, mLocalLog, mTelephonyUtil);
}
@@ -69,7 +69,7 @@
private static final int TEST_CARRIER_ID = 100;
private static final int RSSI_LEVEL = -50;
- private SavedNetworkNominator mSavedNetworkEvaluator;
+ private SavedNetworkNominator mSavedNetworkNominator;
@Mock private WifiConfigManager mWifiConfigManager;
@Mock private Clock mClock;
@Mock private OnConnectableListener mOnConnectableListener;
@@ -98,7 +98,7 @@
wifiConfiguration.useExternalScores = true;
}
- mSavedNetworkEvaluator.nominateNetworks(scanDetails,
+ mSavedNetworkNominator.nominateNetworks(scanDetails,
null, null, true, false, mOnConnectableListener);
verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -125,7 +125,7 @@
.thenReturn(INVALID_SUBID);
when(mTelephonyUtil.isSimPresent(eq(INVALID_SUBID))).thenReturn(false);
- mSavedNetworkEvaluator.nominateNetworks(scanDetails,
+ mSavedNetworkNominator.nominateNetworks(scanDetails,
null, null, true, false, mOnConnectableListener);
verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -152,7 +152,7 @@
wifiConfiguration.ephemeral = true;
}
- mSavedNetworkEvaluator.nominateNetworks(scanDetails,
+ mSavedNetworkNominator.nominateNetworks(scanDetails,
null, null, true, false, mOnConnectableListener);
verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -177,13 +177,13 @@
List<ScanDetail> scanDetails = scanDetailsAndConfigs.getScanDetails();
WifiConfiguration[] savedConfigs = scanDetailsAndConfigs.getWifiConfigs();
- mSavedNetworkEvaluator.nominateNetworks(scanDetails,
+ mSavedNetworkNominator.nominateNetworks(scanDetails,
null, null, true, false, mOnConnectableListener);
verify(mOnConnectableListener, times(2)).onConnectable(any(), any());
reset(mOnConnectableListener);
savedConfigs[1].allowAutojoin = false;
- mSavedNetworkEvaluator.nominateNetworks(scanDetails,
+ mSavedNetworkNominator.nominateNetworks(scanDetails,
null, null, true, false, mOnConnectableListener);
verify(mOnConnectableListener).onConnectable(any(),
mWifiConfigurationArgumentCaptor.capture());
@@ -211,7 +211,7 @@
for (WifiConfiguration wifiConfiguration : savedConfigs) {
wifiConfiguration.allowAutojoin = false;
}
- mSavedNetworkEvaluator.nominateNetworks(scanDetails,
+ mSavedNetworkNominator.nominateNetworks(scanDetails,
null, null, true, false, mOnConnectableListener);
verify(mOnConnectableListener, never()).onConnectable(any(), any());
}
@@ -229,7 +229,7 @@
passpointCandidates.add(Pair.create(scanDetail, configuration));
when(mPasspointNetworkNominateHelper.getPasspointNetworkCandidates(scanDetails, false))
.thenReturn(passpointCandidates);
- mSavedNetworkEvaluator.nominateNetworks(scanDetails, null, null,
+ mSavedNetworkNominator.nominateNetworks(scanDetails, null, null,
false, false, mOnConnectableListener);
verify(mOnConnectableListener).onConnectable(scanDetail, configuration);
}
diff --git a/service/tests/wifitests/src/com/android/server/wifi/ScoredNetworkNominatorTest.java b/service/tests/wifitests/src/com/android/server/wifi/ScoredNetworkNominatorTest.java
index f128eba..2c59451 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/ScoredNetworkNominatorTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/ScoredNetworkNominatorTest.java
@@ -16,7 +16,6 @@
package com.android.server.wifi;
-
import static com.android.server.wifi.WifiConfigurationTestUtil.SECURITY_NONE;
import static com.android.server.wifi.WifiConfigurationTestUtil.SECURITY_PSK;
@@ -82,7 +81,7 @@
@Captor private ArgumentCaptor<WifiConfiguration> mWifiConfigCaptor;
private WifiNetworkScoreCache mScoreCache;
- private ScoredNetworkNominator mScoredNetworkEvaluator;
+ private ScoredNetworkNominator mScoredNetworkNominator;
@Before
public void setUp() throws Exception {
@@ -102,7 +101,7 @@
ArgumentCaptor<ContentObserver> observerCaptor =
ArgumentCaptor.forClass(ContentObserver.class);
mScoreCache = new WifiNetworkScoreCache(mContext);
- mScoredNetworkEvaluator = new ScoredNetworkNominator(mContext,
+ mScoredNetworkNominator = new ScoredNetworkNominator(mContext,
new Handler(Looper.getMainLooper()), mFrameworkFacade, mNetworkScoreManager,
mPackageManager, mWifiConfigManager, new LocalLog(0), mScoreCache,
mWifiPermissionsUtil);
@@ -143,7 +142,7 @@
mContentObserver.onChange(false /* unused */);
- mScoredNetworkEvaluator.update(scanDetailsAndConfigs.getScanDetails());
+ mScoredNetworkNominator.update(scanDetailsAndConfigs.getScanDetails());
verifyZeroInteractions(mNetworkScoreManager);
}
@@ -161,7 +160,7 @@
.setupScanDetailsAndConfigStore(
ssids, bssids, freqs, caps, levels, securities, mWifiConfigManager, mClock);
- mScoredNetworkEvaluator.update(new ArrayList<ScanDetail>());
+ mScoredNetworkNominator.update(new ArrayList<ScanDetail>());
verifyZeroInteractions(mNetworkScoreManager);
}
@@ -179,7 +178,7 @@
.setupScanDetailsAndConfigStore(
ssids, bssids, freqs, caps, levels, securities, mWifiConfigManager, mClock);
- mScoredNetworkEvaluator.update(scanDetailsAndConfigs.getScanDetails());
+ mScoredNetworkNominator.update(scanDetailsAndConfigs.getScanDetails());
verify(mNetworkScoreManager).requestScores(mNetworkKeyCollectionCaptor.capture());
NetworkKey[] requestedScores =
@@ -212,7 +211,7 @@
WifiNetworkSelectorTestUtil.configureScoreCache(
mScoreCache, scoredScanDetails, scores, meteredHints);
- mScoredNetworkEvaluator.update(scanDetailsAndConfigs.getScanDetails());
+ mScoredNetworkNominator.update(scanDetailsAndConfigs.getScanDetails());
verify(mNetworkScoreManager).requestScores(mNetworkKeyCollectionCaptor.capture());
@@ -232,7 +231,7 @@
mContentObserver.onChange(false /* unused */);
- mScoredNetworkEvaluator.nominateNetworks(null, null, null, false, false,
+ mScoredNetworkNominator.nominateNetworks(null, null, null, false, false,
mOnConnectableListener);
verifyZeroInteractions(mWifiConfigManager, mNetworkScoreManager);
@@ -254,7 +253,7 @@
.setupScanDetailsAndConfigStore(
ssids, bssids, freqs, caps, levels, securities, mWifiConfigManager, mClock);
- mScoredNetworkEvaluator.update(scanDetailsAndConfigs.getScanDetails());
+ mScoredNetworkNominator.update(scanDetailsAndConfigs.getScanDetails());
verify(mNetworkScoreManager, never()).requestScores(anyCollection());
verify(mWifiPermissionsUtil).enforceCanAccessScanResults(
@@ -277,7 +276,7 @@
.setupScanDetailsAndConfigStore(
ssids, bssids, freqs, caps, levels, securities, mWifiConfigManager, mClock);
- mScoredNetworkEvaluator.update(scanDetailsAndConfigs.getScanDetails());
+ mScoredNetworkNominator.update(scanDetailsAndConfigs.getScanDetails());
verify(mNetworkScoreManager, never()).requestScores(anyCollection());
verify(mWifiPermissionsUtil).enforceCanAccessScanResults(
@@ -311,7 +310,7 @@
when(mWifiConfigManager.addOrUpdateNetwork(any(), anyInt()))
.thenReturn(new NetworkUpdateResult(1));
// Untrusted networks allowed.
- mScoredNetworkEvaluator.nominateNetworks(scanDetails,
+ mScoredNetworkNominator.nominateNetworks(scanDetails,
null, null, false, true, mOnConnectableListener);
verify(mOnConnectableListener, atLeastOnce())
.onConnectable(any(), mWifiConfigCaptor.capture());
@@ -346,7 +345,7 @@
mWifiConfigManager, 1, scanDetails.get(1), meteredHints[1]);
// Untrusted networks not allowed.
- mScoredNetworkEvaluator.nominateNetworks(scanDetails,
+ mScoredNetworkNominator.nominateNetworks(scanDetails,
null, null, false, false, mOnConnectableListener);
verify(mOnConnectableListener, never()).onConnectable(any(), any());
@@ -376,7 +375,7 @@
WifiNetworkSelectorTestUtil.configureScoreCache(mScoreCache,
scanDetails, scores, meteredHints);
- mScoredNetworkEvaluator.nominateNetworks(scanDetails,
+ mScoredNetworkNominator.nominateNetworks(scanDetails,
null, null, false, true, mOnConnectableListener);
verify(mOnConnectableListener).onConnectable(any(), mWifiConfigCaptor.capture());
@@ -408,7 +407,7 @@
WifiNetworkSelectorTestUtil.configureScoreCache(mScoreCache,
scanDetails, scores, meteredHints);
- mScoredNetworkEvaluator.nominateNetworks(scanDetails,
+ mScoredNetworkNominator.nominateNetworks(scanDetails,
null, null, false, true, mOnConnectableListener);
verify(mOnConnectableListener).onConnectable(any(), mWifiConfigCaptor.capture());
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java
index 1ec9463..e64f06c 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java
@@ -195,17 +195,18 @@
mWifiCandidates.add(mScanDetail1, mConfig1, 2, 14, 0.0, false, 100);
assertEquals(1, mWifiCandidates.size());
- // Same evaluator, same score. Should not add.
+ // Same nominator
+ // , same score. Should not add.
assertFalse(mWifiCandidates.add(mScanDetail1, mConfig1, 2, 14, 0.0, false, 100));
assertEquals(0, mWifiCandidates.getFaultCount()); // But not considered a fault
- // Same evaluator, lower score. Should not add.
+ // Same nominator, lower score. Should not add.
assertFalse(mWifiCandidates.add(mScanDetail1, mConfig1, 2, 13, 0.0, false, 100));
assertEquals(0, mWifiCandidates.getFaultCount()); // Also not a fault
- // Later evaluator. Should not add (regardless of score).
+ // Later nominator. Should not add (regardless of score).
assertFalse(mWifiCandidates.add(mScanDetail1, mConfig1, 5, 13, 0.0, false, 100));
assertFalse(mWifiCandidates.add(mScanDetail1, mConfig1, 5, 15, 0.0, false, 100));
assertEquals(0, mWifiCandidates.getFaultCount()); // Still no faults
- // Evaluator out of order. Should not add (regardless of score).
+ // Nominator out of order. Should not add (regardless of score).
assertFalse(mWifiCandidates.add(mScanDetail1, mConfig1, 1, 12, 0.0, false, 100));
assertNotNull(mWifiCandidates.getLastFault()); // This one is considered a caller error
assertFalse(mWifiCandidates.add(mScanDetail1, mConfig1, 1, 15, 0.0, false, 100));
@@ -285,7 +286,7 @@
assertEquals(1, mWifiCandidates.size());
// And no faults
assertEquals(0, mWifiCandidates.getFaultCount());
- // Make sure we kept the one with a higher evaluatorScore
+ // Make sure we kept the one with a higher nominator score
WifiCandidates.Candidate c;
c = mWifiCandidates.getGroupedCandidates().iterator().next().iterator().next();
assertEquals(90, c.getPredictedThroughputMbps());
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
index 18de284..9240490 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
@@ -63,8 +63,8 @@
@SmallTest
public class WifiNetworkSelectorTest extends WifiBaseTest {
private static final int RSSI_BUMP = 1;
- private static final int DUMMY_EVALUATOR_ID_1 = -2; // lowest index
- private static final int DUMMY_EVALUATOR_ID_2 = -1;
+ private static final int DUMMY_NOMINATOR_ID_1 = -2; // lowest index
+ private static final int DUMMY_NOMINATOR_ID_2 = -1;
private static final HashSet<String> EMPTY_BLACKLIST = new HashSet<>();
/** Sets up test. */
@@ -90,8 +90,8 @@
mWifiNative,
mThroughputPredictor);
- mWifiNetworkSelector.registerNetworkNominator(mDummyEvaluator);
- mDummyEvaluator.setEvaluatorToSelectCandidate(true);
+ mWifiNetworkSelector.registerNetworkNominator(mDummyNominator);
+ mDummyNominator.setNominatorToSelectCandidate(true);
when(mClock.getElapsedSinceBootMillis()).thenReturn(SystemClock.elapsedRealtime());
when(mWifiScoreCard.lookupBssid(any(), any())).thenReturn(mPerBssid);
mCompatibilityScorer = new CompatibilityScorer(mScoringParams);
@@ -113,10 +113,10 @@
}
/**
- * All this dummy network evaluator does is to pick the specified network in the scan results.
+ * All this dummy network Nominator does is to pick the specified network in the scan results.
*/
public class DummyNetworkNominator implements WifiNetworkSelector.NetworkNominator {
- private static final String NAME = "DummyNetworkEvaluator";
+ private static final String NAME = "DummyNetworkNominator";
private boolean mNominatorShouldSelectCandidate = true;
@@ -129,7 +129,7 @@
}
public DummyNetworkNominator() {
- this(0, DUMMY_EVALUATOR_ID_1);
+ this(0, DUMMY_NOMINATOR_ID_1);
}
public int getNetworkIndexToReturn() {
@@ -156,12 +156,12 @@
/**
* Sets whether the nominator should return a candidate for connection or null.
*/
- public void setEvaluatorToSelectCandidate(boolean shouldSelectCandidate) {
+ public void setNominatorToSelectCandidate(boolean shouldSelectCandidate) {
mNominatorShouldSelectCandidate = shouldSelectCandidate;
}
/**
- * This NetworkEvaluator can be configured to return a candidate or null. If returning a
+ * This NetworkNominator can be configured to return a candidate or null. If returning a
* candidate, the first entry in the provided scanDetails will be selected. This requires
* that the mock WifiConfigManager be set up to return a WifiConfiguration for the first
* scanDetail entry, through
@@ -191,7 +191,7 @@
}
private WifiNetworkSelector mWifiNetworkSelector = null;
- private DummyNetworkNominator mDummyEvaluator = new DummyNetworkNominator();
+ private DummyNetworkNominator mDummyNominator = new DummyNetworkNominator();
@Mock private WifiConfigManager mWifiConfigManager;
@Mock private Context mContext;
@Mock private WifiScoreCard mWifiScoreCard;
@@ -683,7 +683,7 @@
* Expected behavior: test2 is the recommended network
*/
@Test
- public void userConnectChoiceOverridesNetworkEvaluators() {
+ public void userConnectChoiceOverridesNetworkNominators() {
String[] ssids = {"\"test1\"", "\"test2\""};
String[] bssids = {"6c:f3:7f:ae:8c:f3", "6c:f3:7f:ae:8c:f4"};
int[] freqs = {2437, 5180};
@@ -697,7 +697,7 @@
List<ScanDetail> scanDetails = scanDetailsAndConfigs.getScanDetails();
HashSet<String> blacklist = new HashSet<String>();
- // DummyEvaluator always selects the first network in the list.
+ // DummyNominator always selects the first network in the list.
WifiConfiguration networkSelectorChoice = scanDetailsAndConfigs.getWifiConfigs()[0];
networkSelectorChoice.getNetworkSelectionStatus()
.setSeenInLastQualifiedNetworkSelection(true);
@@ -713,7 +713,7 @@
ArgumentCaptor<Integer> nominatorIdCaptor = ArgumentCaptor.forClass(int.class);
verify(mWifiMetrics, atLeastOnce()).setNominatorForNetwork(eq(candidate.networkId),
nominatorIdCaptor.capture());
- // unknown because DummyEvaluator does not have a nominator ID
+ // unknown because DummyNominator does not have a nominator ID
// getValue() returns the argument from the *last* call
assertEquals(WifiMetricsProto.ConnectionEvent.NOMINATOR_UNKNOWN,
nominatorIdCaptor.getValue().intValue());
@@ -738,16 +738,16 @@
}
/**
- * Tests when multiple evaluators nominate the same candidate, any one of the nominator IDs is
+ * Tests when multiple Nominators nominate the same candidate, any one of the nominator IDs is
* acceptable.
*/
@Test
- 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
+ public void testMultipleNominatorsSetsNominatorIdCorrectly() {
+ // first dummy Nominator is registered in setup, returns index 0
+ // register a second network Nominator that also returns index 0, but with a different ID
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
+ // register a third network Nominator that also returns index 0, but with a different ID
mWifiNetworkSelector.registerNetworkNominator(new DummyNetworkNominator(0,
WifiNetworkSelector.NetworkNominator.NOMINATOR_ID_SAVED));
@@ -764,7 +764,7 @@
List<ScanDetail> scanDetails = scanDetailsAndConfigs.getScanDetails();
HashSet<String> blacklist = new HashSet<>();
- // DummyEvaluator always selects the first network in the list.
+ // DummyNominator always selects the first network in the list.
WifiConfiguration networkSelectorChoice = scanDetailsAndConfigs.getWifiConfigs()[0];
networkSelectorChoice.getNetworkSelectionStatus()
.setSeenInLastQualifiedNetworkSelection(true);
@@ -943,7 +943,7 @@
freqs, caps, levels, securities, mWifiConfigManager, mClock);
List<ScanDetail> scanDetails = scanDetailsAndConfigs.getScanDetails();
HashSet<String> blacklist = new HashSet<String>();
- // DummyNetworkEvaluator always return the first network in the scan results
+ // DummyNetworkNominator always return the first network in the scan results
// for connection, so this should connect to the first network.
WifiConfiguration candidate = mWifiNetworkSelector.selectNetwork(scanDetails,
blacklist, mWifiInfo, false, true, true);
@@ -971,7 +971,7 @@
candidate = mWifiNetworkSelector.selectNetwork(scanDetails, blacklist, mWifiInfo,
true, false, false);
- // DummyNetworkEvaluator always return the first network in the scan results
+ // DummyNetworkNominator always return the first network in the scan results
// for connection, so if network selection is performed, the first network should
// be returned as candidate.
if (shouldSelect) {
@@ -996,7 +996,7 @@
int[] freqs = {2437, 5180};
String[] caps = {"[WPA2-EAP-CCMP][ESS]", "[ESS]"};
int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP, mThresholdMinimumRssi5G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
+ mDummyNominator.setNominatorToSelectCandidate(false);
List<ScanDetail> scanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
ssids, bssids, freqs, caps, levels, mClock);
@@ -1026,7 +1026,7 @@
String[] caps = {"[ESS]"};
int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP};
int[] securities = {SECURITY_NONE};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
+ mDummyNominator.setNominatorToSelectCandidate(false);
List<ScanDetail> unSavedScanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
ssids, bssids, freqs, caps, levels, mClock);
@@ -1062,7 +1062,7 @@
int[] freqs = {2437, 5180};
String[] caps = {"[ESS]", "[ESS]"};
int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP, mThresholdMinimumRssi5G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
+ mDummyNominator.setNominatorToSelectCandidate(false);
List<ScanDetail> scanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
ssids, bssids, freqs, caps, levels, mClock);
@@ -1090,7 +1090,7 @@
int[] freqs = {2437, 5180};
String[] caps = {"[WPA2-EAP-CCMP][ESS]", "[WPA2-EAP-CCMP][ESS]"};
int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP, mThresholdMinimumRssi5G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
+ mDummyNominator.setNominatorToSelectCandidate(false);
List<ScanDetail> scanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
ssids, bssids, freqs, caps, levels, mClock);
@@ -1126,7 +1126,7 @@
String[] caps = {"[WPA2-EAP-CCMP][ESS]", "[ESS]", "[RSN-OWE-CCMP][ESS]"};
int[] levels = {mThresholdMinimumRssi2G, mThresholdMinimumRssi5G + RSSI_BUMP,
mThresholdMinimumRssi2G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
+ mDummyNominator.setNominatorToSelectCandidate(false);
when(mWifiNative.getSupportedFeatureSet(anyString()))
.thenReturn(new Long(WIFI_FEATURE_OWE));
@@ -1158,7 +1158,7 @@
String[] caps = {"[WPA2-EAP-CCMP][ESS]", "[ESS]", "[RSN-OWE-CCMP][ESS]"};
int[] levels = {mThresholdMinimumRssi2G, mThresholdMinimumRssi5G + RSSI_BUMP,
mThresholdMinimumRssi2G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
+ mDummyNominator.setNominatorToSelectCandidate(false);
when(mWifiNative.getSupportedFeatureSet(anyString()))
.thenReturn(new Long(~WIFI_FEATURE_OWE));
@@ -1244,9 +1244,9 @@
mWifiNetworkSelector.registerCandidateScorer(mCompatibilityScorer);
mWifiNetworkSelector.registerCandidateScorer(NULL_SCORER);
- // add a second NetworkEvaluator that returns the second network in the scan list
+ // add a second NetworkNominator that returns the second network in the scan list
mWifiNetworkSelector.registerNetworkNominator(
- new DummyNetworkNominator(1, DUMMY_EVALUATOR_ID_2));
+ new DummyNetworkNominator(1, DUMMY_NOMINATOR_ID_2));
int compatibilityExpId = experimentIdFromIdentifier(mCompatibilityScorer.getIdentifier());
mScoringParams.update("expid=" + compatibilityExpId);
@@ -1278,9 +1278,9 @@
mWifiNetworkSelector.registerCandidateScorer(mThroughputScorer);
}
- // add a second NetworkEvaluator that returns the second network in the scan list
+ // add a second NetworkNominator that returns the second network in the scan list
mWifiNetworkSelector.registerNetworkNominator(
- new DummyNetworkNominator(1, DUMMY_EVALUATOR_ID_2));
+ new DummyNetworkNominator(1, DUMMY_NOMINATOR_ID_2));
testNoActiveStream();
@@ -1322,7 +1322,7 @@
when(mWifiConfigManager.getConfiguredNetwork(configs[0].networkId))
.thenReturn(existingConfig);
mWifiNetworkSelector.registerNetworkNominator(
- new DummyNetworkNominator(0, DUMMY_EVALUATOR_ID_2));
+ new DummyNetworkNominator(0, DUMMY_NOMINATOR_ID_2));
WifiConfiguration candidate = mWifiNetworkSelector
.selectNetwork(scanDetails, blackList, mWifiInfo, false, true, true);
// Check if the wifiConfig is updated with the latest
