diff options
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index c1a334a5d..4a27fef97 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -190,7 +190,7 @@ public class WifiConfigManager { */ private static final int[] NETWORK_SELECTION_DISABLE_THRESHOLD = { -1, // threshold for NETWORK_SELECTION_ENABLE - 1, // threshold for DISABLED_BAD_LINK + 1, // threshold for DISABLED_BAD_LINK (deprecated) 5, // threshold for DISABLED_ASSOCIATION_REJECTION 5, // threshold for DISABLED_AUTHENTICATION_FAILURE 5, // threshold for DISABLED_DHCP_FAILURE @@ -206,7 +206,7 @@ public class WifiConfigManager { */ private static final int[] NETWORK_SELECTION_DISABLE_TIMEOUT = { Integer.MAX_VALUE, // threshold for NETWORK_SELECTION_ENABLE - 15, // threshold for DISABLED_BAD_LINK + 15, // threshold for DISABLED_BAD_LINK (deprecated) 5, // threshold for DISABLED_ASSOCIATION_REJECTION 5, // threshold for DISABLED_AUTHENTICATION_FAILURE 5, // threshold for DISABLED_DHCP_FAILURE @@ -243,11 +243,6 @@ public class WifiConfigManager { public AtomicInteger mBandAward5Ghz = new AtomicInteger(); /** - * If Connectivity Service has triggered an unwanted network disconnect - */ - public long mLastUnwantedNetworkDisconnectTimestamp = 0; - - /** * Framework keeps a list of ephemeral SSIDs that where deleted by user, * so as, framework knows not to autojoin again those SSIDs based on scorer input. * The list is never cleared up. @@ -1658,6 +1653,7 @@ public class WifiConfigManager { // 2) mConfiguredNetworks caches a Passpoint network's FQDN the moment the network is added. // Thus, we had to load the FQDNs first. mConfiguredNetworks.clear(); + mScanDetailCaches.clear(); for (Map.Entry<String, WifiConfiguration> entry : configs.entrySet()) { final String configKey = entry.getKey(); final WifiConfiguration config = entry.getValue(); @@ -2461,20 +2457,8 @@ public class WifiConfigManager { } private Map<HomeSP, PasspointMatch> matchPasspointNetworks(ScanDetail scanDetail) { + // Nothing to do if no Hotspot 2.0 provider is configured. if (!mMOManager.isConfigured()) { - if (mEnableOsuQueries) { - NetworkDetail networkDetail = scanDetail.getNetworkDetail(); - List<Constants.ANQPElementType> querySet = - ANQPFactory.buildQueryList(networkDetail, false, true); - - if (networkDetail.queriable(querySet)) { - querySet = mAnqpCache.initiate(networkDetail, querySet); - if (querySet != null) { - mSupplicantBridge.startANQP(scanDetail, querySet); - } - updateAnqpCache(scanDetail, networkDetail.getANQPElements()); - } - } return null; } NetworkDetail networkDetail = scanDetail.getNetworkDetail(); @@ -3222,29 +3206,6 @@ public class WifiConfigManager { } } - /** called when CS ask WiFistateMachine to disconnect the current network - * because the score is bad. - */ - void handleBadNetworkDisconnectReport(int netId, WifiInfo info) { - /* TODO verify the bad network is current */ - WifiConfiguration config = mConfiguredNetworks.getForCurrentUser(netId); - if (config != null) { - if ((info.is24GHz() && info.getRssi() - <= WifiQualifiedNetworkSelector.QUALIFIED_RSSI_24G_BAND) - || (info.is5GHz() && info.getRssi() - <= WifiQualifiedNetworkSelector.QUALIFIED_RSSI_5G_BAND)) { - // We do not block due to bad RSSI since network selection should not select bad - // RSSI candidate - } else { - // We got disabled but RSSI is good, so disable hard - updateNetworkSelectionStatus(config, - WifiConfiguration.NetworkSelectionStatus.DISABLED_BAD_LINK); - } - } - // Record last time Connectivity Service switched us away from WiFi and onto Cell - mLastUnwantedNetworkDisconnectTimestamp = mClock.currentTimeMillis(); - } - int getMaxDhcpRetries() { return mFacade.getIntegerSetting(mContext, Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT, |