diff options
5 files changed, 77 insertions, 63 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 0df099fb5..8f7a51c3c 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -526,17 +526,23 @@ public class WifiConfigManager { return mConfiguredNetworks.sizeForCurrentUser(); } - private List<WifiConfiguration> getConfiguredNetworks(Map<String, String> pskMap) { + /** + * Fetch the list of currently saved networks (i.e. all configured networks, excluding + * ephemeral networks). + * @param pskMap Map of preSharedKeys, keyed by the configKey of the configuration the + * preSharedKeys belong to + * @return List of networks + */ + private List<WifiConfiguration> getSavedNetworks(Map<String, String> pskMap) { List<WifiConfiguration> networks = new ArrayList<>(); for (WifiConfiguration config : mConfiguredNetworks.valuesForCurrentUser()) { WifiConfiguration newConfig = new WifiConfiguration(config); // When updating this condition, update WifiStateMachine's CONNECT_NETWORK handler to // correctly handle updating existing configs that are filtered out here. if (config.ephemeral) { - // Do not enumerate and return this configuration to any one, - // for instance WiFi Picker. - // instead treat it as unknown. the configuration can still be retrieved - // directly by the key or networkId + // Do not enumerate and return this configuration to anyone (e.g. WiFi Picker); + // treat it as unknown instead. This configuration can still be retrieved + // directly by its key or networkId. continue; } @@ -551,7 +557,7 @@ public class WifiConfigManager { } /** - * This function returns all configuration, and is used for cebug and creating bug reports. + * This function returns all configuration, and is used for debug and creating bug reports. */ private List<WifiConfiguration> getAllConfiguredNetworks() { List<WifiConfiguration> networks = new ArrayList<>(); @@ -563,20 +569,22 @@ public class WifiConfigManager { } /** - * Fetch the list of currently configured networks + * Fetch the list of currently saved networks (i.e. all configured networks, excluding + * ephemeral networks). * @return List of networks */ - public List<WifiConfiguration> getConfiguredNetworks() { - return getConfiguredNetworks(null); + public List<WifiConfiguration> getSavedNetworks() { + return getSavedNetworks(null); } /** - * Fetch the list of currently configured networks, filled with real preSharedKeys + * Fetch the list of currently saved networks (i.e. all configured networks, excluding + * ephemeral networks), filled with real preSharedKeys. * @return List of networks */ - List<WifiConfiguration> getPrivilegedConfiguredNetworks() { + List<WifiConfiguration> getPrivilegedSavedNetworks() { Map<String, String> pskMap = getCredentialsByConfigKeyMap(); - List<WifiConfiguration> configurations = getConfiguredNetworks(pskMap); + List<WifiConfiguration> configurations = getSavedNetworks(pskMap); for (WifiConfiguration configuration : configurations) { try { configuration @@ -625,27 +633,33 @@ public class WifiConfigManager { } /** - * Fetch the list of currently configured networks that were recently seen + * Fetch the list of currently saved networks (i.e. all configured networks, excluding + * ephemeral networks) that were recently seen. * + * @param scanResultAgeMs The maximum age (in ms) of scan results for which we calculate the + * RSSI values + * @param copy If true, the returned list will contain copies of the configurations for the + * saved networks. Otherwise, the returned list will contain references to these + * configurations. * @return List of networks */ - List<WifiConfiguration> getRecentConfiguredNetworks(int milli, boolean copy) { + List<WifiConfiguration> getRecentSavedNetworks(int scanResultAgeMs, boolean copy) { List<WifiConfiguration> networks = new ArrayList<WifiConfiguration>(); for (WifiConfiguration config : mConfiguredNetworks.valuesForCurrentUser()) { if (config.ephemeral) { - // Do not enumerate and return this configuration to any one, - // instead treat it as unknown. the configuration can still be retrieved - // directly by the key or networkId + // Do not enumerate and return this configuration to anyone (e.g. WiFi Picker); + // treat it as unknown instead. This configuration can still be retrieved + // directly by its key or networkId. continue; } - // Calculate the RSSI for scan results that are more recent than milli + // Calculate the RSSI for scan results that are more recent than scanResultAgeMs. ScanDetailCache cache = getScanDetailCache(config); if (cache == null) { continue; } - config.setVisibility(cache.getVisibility(milli)); + config.setVisibility(cache.getVisibility(scanResultAgeMs)); if (config.visibility == null) { continue; } diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java index c129ee3d5..cc7d082d2 100644 --- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java @@ -423,7 +423,7 @@ public class WifiQualifiedNetworkSelector { * This API try to update all the saved networks' network selection status */ private void updateSavedNetworkSelectionStatus() { - List<WifiConfiguration> savedNetworks = mWifiConfigManager.getConfiguredNetworks(); + List<WifiConfiguration> savedNetworks = mWifiConfigManager.getSavedNetworks(); if (savedNetworks.size() == 0) { qnsLog("no saved network"); return; @@ -498,7 +498,7 @@ public class WifiQualifiedNetworkSelector { boolean change = false; String key = selected.configKey(); long currentTime = mClock.currentTimeMillis(); - List<WifiConfiguration> savedNetworks = mWifiConfigManager.getConfiguredNetworks(); + List<WifiConfiguration> savedNetworks = mWifiConfigManager.getSavedNetworks(); for (WifiConfiguration network : savedNetworks) { WifiConfiguration config = mWifiConfigManager.getWifiConfiguration(network.networkId); diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index edaffd609..927f63ec7 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5748,7 +5748,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss break; case CMD_GET_CONFIGURED_NETWORKS: replyToMessage(message, message.what, - mWifiConfigManager.getConfiguredNetworks()); + mWifiConfigManager.getSavedNetworks()); break; case WifiMonitor.SUP_REQUEST_IDENTITY: int networkId = message.arg2; @@ -5818,7 +5818,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss break; case CMD_GET_PRIVILEGED_CONFIGURED_NETWORKS: replyToMessage(message, message.what, - mWifiConfigManager.getPrivilegedConfiguredNetworks()); + mWifiConfigManager.getPrivilegedSavedNetworks()); break; case CMD_GET_MATCHING_CONFIG: replyToMessage(message, message.what, @@ -7710,7 +7710,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss * Note that these are not wake up scans. */ if (mNoNetworksPeriodicScan != 0 && !mP2pConnected.get() - && mWifiConfigManager.getConfiguredNetworks().size() == 0) { + && mWifiConfigManager.getSavedNetworks().size() == 0) { sendMessageDelayed(obtainMessage(CMD_NO_NETWORKS_PERIODIC_SCAN, ++mPeriodicScanToken, 0), mNoNetworksPeriodicScan); } @@ -7727,7 +7727,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss case CMD_NO_NETWORKS_PERIODIC_SCAN: if (mP2pConnected.get()) break; if (mNoNetworksPeriodicScan != 0 && message.arg1 == mPeriodicScanToken && - mWifiConfigManager.getConfiguredNetworks().size() == 0) { + mWifiConfigManager.getSavedNetworks().size() == 0) { startScan(UNKNOWN_SCAN_SOURCE, -1, null, WIFI_WORK_SOURCE); sendMessageDelayed(obtainMessage(CMD_NO_NETWORKS_PERIODIC_SCAN, ++mPeriodicScanToken, 0), mNoNetworksPeriodicScan); @@ -7815,7 +7815,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss Settings.Global.WIFI_SCAN_INTERVAL_WHEN_P2P_CONNECTED_MS, defaultInterval); mWifiNative.setScanInterval((int) scanIntervalMs/1000); - } else if (mWifiConfigManager.getConfiguredNetworks().size() == 0) { + } else if (mWifiConfigManager.getSavedNetworks().size() == 0) { if (DBG) log("Turn on scanning after p2p disconnected"); sendMessageDelayed(obtainMessage(CMD_NO_NETWORKS_PERIODIC_SCAN, ++mPeriodicScanToken, 0), mNoNetworksPeriodicScan); @@ -8442,7 +8442,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss int numEnterpriseNetworks = 0; int numNetworksAddedByUser = 0; int numNetworksAddedByApps = 0; - for (WifiConfiguration config : mWifiConfigManager.getConfiguredNetworks()) { + for (WifiConfiguration config : mWifiConfigManager.getSavedNetworks()) { if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.NONE)) { numOpenNetworks++; } else if (config.isEnterprise()) { diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index fcc7c8764..3de14f8ae 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -289,7 +289,7 @@ public class WifiConfigManagerTest { addNetworks(); for (Map.Entry<Integer, List<WifiConfiguration>> entry : VISIBLE_CONFIGS.entrySet()) { switchUser(entry.getKey()); - verifyNetworkConfigs(entry.getValue(), mWifiConfigManager.getConfiguredNetworks()); + verifyNetworkConfigs(entry.getValue(), mWifiConfigManager.getSavedNetworks()); } } @@ -303,7 +303,7 @@ public class WifiConfigManagerTest { for (Map.Entry<Integer, List<WifiConfiguration>> entry : VISIBLE_CONFIGS.entrySet()) { switchUser(entry.getKey()); verifyNetworkConfigs(entry.getValue(), - mWifiConfigManager.getPrivilegedConfiguredNetworks()); + mWifiConfigManager.getPrivilegedSavedNetworks()); } } @@ -832,7 +832,7 @@ public class WifiConfigManagerTest { // Load back the configuration. mWifiConfigManager.loadConfiguredNetworks(); - List<WifiConfiguration> configs = mWifiConfigManager.getConfiguredNetworks(); + List<WifiConfiguration> configs = mWifiConfigManager.getSavedNetworks(); assertEquals(1, configs.size()); WifiConfiguration loadedConfig = configs.get(0); assertEquals(ssid, unquote(loadedConfig.SSID)); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java index 002e27092..92e16b392 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java @@ -310,7 +310,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); @@ -348,7 +348,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(scanDetails.size() - 1).getScanResult(); @@ -385,7 +385,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(scanDetails.size() - 1).getScanResult(); @@ -422,7 +422,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -459,7 +459,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(scanDetails.size() - 1).getScanResult(); @@ -496,7 +496,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); WifiConfiguration candidate = mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, @@ -531,7 +531,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -567,7 +567,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -602,7 +602,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -628,7 +628,7 @@ public class WifiQualifiedNetworkSelectorTest { final WifiConfiguration[] configs = generateWifiConfigurations(ssids, security); prepareConfigStore(configs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(Arrays.asList(configs)); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(Arrays.asList(configs)); for (WifiConfiguration network : configs) { WifiConfiguration.NetworkSelectionStatus status = network.getNetworkSelectionStatus(); status.setSeenInLastQualifiedNetworkSelection(true); @@ -674,7 +674,7 @@ public class WifiQualifiedNetworkSelectorTest { status.setSeenInLastQualifiedNetworkSelection(true); } - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(Arrays.asList(configs)); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(Arrays.asList(configs)); //set user preference mWifiQualifiedNetworkSelector.userSelectNetwork(ssids.length - 1, true); @@ -765,7 +765,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -805,7 +805,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(1).getScanResult(); @@ -848,7 +848,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(1).getScanResult(); @@ -893,7 +893,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -932,7 +932,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); WifiConfiguration candidate = mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, @@ -965,7 +965,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); //first QNS mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, @@ -1003,7 +1003,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); //first QNS mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, @@ -1039,7 +1039,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); //first QNS mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, @@ -1075,7 +1075,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); WifiConfiguration candidate = mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, @@ -1110,7 +1110,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); //first time, connect to test2 due to 5GHz bonus @@ -1154,7 +1154,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); //first connect to test2 due to 5GHz bonus @@ -1194,7 +1194,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); when(mWifiInfo.getNetworkId()).thenReturn(0); when(mWifiInfo.getBSSID()).thenReturn(bssids[0]); @@ -1236,7 +1236,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); //first connect to test2 because of RSSI @@ -1284,7 +1284,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); //first connect to test2 since test1's RSSI is negligible @@ -1330,7 +1330,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, @@ -1376,7 +1376,7 @@ public class WifiQualifiedNetworkSelectorTest { WifiConfiguration[] savedConfigs = generateWifiConfigurations(ssids, security); prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, @@ -1425,7 +1425,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, @@ -1471,7 +1471,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, false, true, false); @@ -1523,7 +1523,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, false, true, false); @@ -1574,7 +1574,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, scanDetails); mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, false, true, false); @@ -1703,7 +1703,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); List<ScanDetail> savedScanDetails = new ArrayList<ScanDetail>(scanDetails.subList(0, 2)); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, savedScanDetails); //Force mock ConfigManager to return null (and not an empty list) for "test3" & "test4" @@ -1782,7 +1782,7 @@ public class WifiQualifiedNetworkSelectorTest { prepareConfigStore(savedConfigs); List<ScanDetail> savedScanDetails = new ArrayList<ScanDetail>(scanDetails.subList(0, 2)); final List<WifiConfiguration> savedNetwork = Arrays.asList(savedConfigs); - when(mWifiConfigManager.getConfiguredNetworks()).thenReturn(savedNetwork); + when(mWifiConfigManager.getSavedNetworks()).thenReturn(savedNetwork); scanResultLinkConfiguration(savedConfigs, savedScanDetails); //Force mock ConfigManager to return null (and not an empty list) for "test3" & "test4" |