summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--service/java/com/android/server/wifi/WifiNetworkSelector.java30
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java160
2 files changed, 0 insertions, 190 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java
index 85bd9174a..1b19b3d2e 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java
@@ -482,36 +482,6 @@ public class WifiNetworkSelector {
}
/**
- * This returns a list of ScanDetails that were filtered in the process of network selection.
- * The list is further filtered for only carrier unsaved networks with EAP encryption.
- *
- * @param carrierConfig CarrierNetworkConfig used to filter carrier networks
- * @return the list of ScanDetails for carrier unsaved networks that do not have invalid SSIDS,
- * blacklisted BSSIDS, or low signal strength, and with EAP encryption. This will return an
- * empty list when there are no such networks, or when network selection has not been run.
- */
- public List<ScanDetail> getFilteredScanDetailsForCarrierUnsavedNetworks(
- CarrierNetworkConfig carrierConfig) {
- List<ScanDetail> carrierUnsavedNetworks = new ArrayList<>();
- for (ScanDetail scanDetail : mFilteredNetworks) {
- ScanResult scanResult = scanDetail.getScanResult();
-
- if (!ScanResultUtil.isScanResultForEapNetwork(scanResult)
- || !carrierConfig.isCarrierNetwork(scanResult.SSID)) {
- continue;
- }
-
- // Skip saved networks
- if (mWifiConfigManager.getConfiguredNetworkForScanDetailAndCache(scanDetail) != null) {
- continue;
- }
-
- carrierUnsavedNetworks.add(scanDetail);
- }
- return carrierUnsavedNetworks;
- }
-
- /**
* @return the list of ScanDetails scored as potential candidates by the last run of
* selectNetwork, this will be empty if Network selector determined no selection was
* needed on last run. This includes scan details of sufficient signal strength, and
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
index bd7256a76..70640dd83 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java
@@ -1379,166 +1379,6 @@ public class WifiNetworkSelectorTest {
}
/**
- * {@link WifiNetworkSelector#getFilteredScanDetailsForCarrierUnsavedNetworks()} should filter
- * out networks that are not EAP after network selection is made.
- *
- * Expected behavior: return EAP networks only
- */
- @Test
- public void getfilterCarrierUnsavedNetworks_filtersForEapNetworks() {
- String[] ssids = {"\"test1\"", "\"test2\""};
- String[] bssids = {"6c:f3:7f:ae:8c:f3", "6c:f3:7f:ae:8c:f4"};
- int[] freqs = {2437, 5180};
- String[] caps = {"[WPA2-EAP-CCMP][ESS]", "[ESS]"};
- int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP, mThresholdMinimumRssi5G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
-
- List<ScanDetail> scanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
- ssids, bssids, freqs, caps, levels, mClock);
- HashSet<String> blacklist = new HashSet<>();
-
- mWifiNetworkSelector.selectNetwork(scanDetails, blacklist, mWifiInfo, false, true, false);
- List<ScanDetail> expectedCarrierUnsavedNetworks = new ArrayList<>();
- expectedCarrierUnsavedNetworks.add(scanDetails.get(0));
- assertEquals("Expect carrier unsaved networks",
- expectedCarrierUnsavedNetworks,
- mWifiNetworkSelector.getFilteredScanDetailsForCarrierUnsavedNetworks(
- mCarrierNetworkConfig));
- }
-
- /**
- * {@link WifiNetworkSelector#getFilteredScanDetailsForCarrierUnsavedNetworks()} should filter
- * out saved networks after network selection is made. This should return an empty list when
- * there are no unsaved networks available.
- *
- * Expected behavior: return unsaved networks only. Return empty list if there are no unsaved
- * networks.
- */
- @Test
- public void getfilterCarrierUnsavedNetworks_filtersOutSavedNetworks() {
- String[] ssids = {"\"test1\""};
- String[] bssids = {"6c:f3:7f:ae:8c:f3"};
- int[] freqs = {2437, 5180};
- String[] caps = {"[WPA2-EAP-CCMP][ESS]"};
- int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP};
- int[] securities = {SECURITY_EAP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
-
- List<ScanDetail> unSavedScanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
- ssids, bssids, freqs, caps, levels, mClock);
- HashSet<String> blacklist = new HashSet<>();
-
- mWifiNetworkSelector.selectNetwork(
- unSavedScanDetails, blacklist, mWifiInfo, false, true, false);
- assertEquals("Expect carrier unsaved networks",
- unSavedScanDetails,
- mWifiNetworkSelector.getFilteredScanDetailsForCarrierUnsavedNetworks(
- mCarrierNetworkConfig));
-
- ScanDetailsAndWifiConfigs scanDetailsAndConfigs =
- WifiNetworkSelectorTestUtil.setupScanDetailsAndConfigStore(ssids, bssids,
- freqs, caps, levels, securities, mWifiConfigManager, mClock);
- List<ScanDetail> savedScanDetails = scanDetailsAndConfigs.getScanDetails();
-
- mWifiNetworkSelector.selectNetwork(
- savedScanDetails, blacklist, mWifiInfo, false, true, false);
- // Saved networks are filtered out.
- assertTrue(mWifiNetworkSelector.getFilteredScanDetailsForCarrierUnsavedNetworks(
- mCarrierNetworkConfig).isEmpty());
- }
-
- /**
- * {@link WifiNetworkSelector#getFilteredScanDetailsForCarrierUnsavedNetworks()} should filter
- * out bssid blacklisted networks.
- *
- * Expected behavior: do not return blacklisted network
- */
- @Test
- public void getfilterCarrierUnsavedNetworks_filtersOutBlacklistedNetworks() {
- String[] ssids = {"\"test1\"", "\"test2\""};
- String[] bssids = {"6c:f3:7f:ae:8c:f3", "6c:f3:7f:ae:8c:f4"};
- int[] freqs = {2437, 5180};
- String[] caps = {"[EAP][ESS]", "[EAP]"};
- int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP, mThresholdMinimumRssi5G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
-
- List<ScanDetail> scanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
- ssids, bssids, freqs, caps, levels, mClock);
- HashSet<String> blacklist = new HashSet<>();
- blacklist.add(bssids[0]);
-
- mWifiNetworkSelector.selectNetwork(scanDetails, blacklist, mWifiInfo, false, true, false);
- List<ScanDetail> expectedCarrierUnsavedNetworks = new ArrayList<>();
- expectedCarrierUnsavedNetworks.add(scanDetails.get(1));
- assertEquals("Expect carrier unsaved networks",
- expectedCarrierUnsavedNetworks,
- mWifiNetworkSelector.getFilteredScanDetailsForCarrierUnsavedNetworks(
- mCarrierNetworkConfig));
- }
-
- /**
- * {@link WifiNetworkSelector#getFilteredScanDetailsForCarrierUnsavedNetworks()} should return
- * empty list when there are no EAP encrypted networks after network selection is made.
- *
- * Expected behavior: return empty list
- */
- @Test
- public void getfilterCarrierUnsavedNetworks_returnsEmptyListWhenNoEAPNetworksPresent() {
- String[] ssids = {"\"test1\"", "\"test2\""};
- String[] bssids = {"6c:f3:7f:ae:8c:f3", "6c:f3:7f:ae:8c:f4"};
- int[] freqs = {2437, 5180};
- String[] caps = {"[ESS]", "[WPA2-CCMP][ESS]"};
- int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP, mThresholdMinimumRssi5G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
-
- List<ScanDetail> scanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
- ssids, bssids, freqs, caps, levels, mClock);
- HashSet<String> blacklist = new HashSet<>();
-
- mWifiNetworkSelector.selectNetwork(scanDetails, blacklist, mWifiInfo, false, true, false);
- assertTrue(mWifiNetworkSelector.getFilteredScanDetailsForCarrierUnsavedNetworks(
- mCarrierNetworkConfig).isEmpty());
- }
-
- /**
- * {@link WifiNetworkSelector#getFilteredScanDetailsForCarrierUnsavedNetworks()} should return
- * empty list when there are no carrier networks after network selection is made.
- *
- * Expected behavior: return empty list
- */
- @Test
- public void getfilterCarrierUnsavedNetworks_returnsEmptyListWhenNoCarrierNetworksPresent() {
- String[] ssids = {"\"test1\"", "\"test2\""};
- String[] bssids = {"6c:f3:7f:ae:8c:f3", "6c:f3:7f:ae:8c:f4"};
- int[] freqs = {2437, 5180};
- String[] caps = {"[EAP][ESS]", "[WPA2-EAP-CCMP][ESS]"};
- int[] levels = {mThresholdMinimumRssi2G + RSSI_BUMP, mThresholdMinimumRssi5G + RSSI_BUMP};
- mDummyEvaluator.setEvaluatorToSelectCandidate(false);
-
- List<ScanDetail> scanDetails = WifiNetworkSelectorTestUtil.buildScanDetails(
- ssids, bssids, freqs, caps, levels, mClock);
- HashSet<String> blacklist = new HashSet<>();
-
- mWifiNetworkSelector.selectNetwork(scanDetails, blacklist, mWifiInfo, false, true, false);
-
- when(mCarrierNetworkConfig.isCarrierNetwork(any())).thenReturn(false);
- assertTrue(mWifiNetworkSelector.getFilteredScanDetailsForCarrierUnsavedNetworks(
- mCarrierNetworkConfig).isEmpty());
- }
-
- /**
- * {@link WifiNetworkSelector#getFilteredScanDetailsForCarrierUnsavedNetworks()} should return
- * empty list when no network selection has been made.
- *
- * Expected behavior: return empty list
- */
- @Test
- public void getfilterCarrierUnsavedNetworks_returnsEmptyListWhenNoNetworkSelectionMade() {
- assertTrue(mWifiNetworkSelector.getFilteredScanDetailsForCarrierUnsavedNetworks(
- mCarrierNetworkConfig).isEmpty());
- }
-
- /**
* Test registerCandidateScorer.
*
* Just make sure it does not crash, for now.
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 16:50:54 +0000