From 19628835ddf7b7557ff61dfdf00e916abc2c13d2 Mon Sep 17 00:00:00 2001 From: Randy Pan Date: Mon, 11 Apr 2016 13:31:20 -0700 Subject: Remove check for roaming by supplicant from QNS With network switching and roaming by wpa_supplicant disabled, QNS does not have to check for that any more. Bug: 27932378 Change-Id: Iba4639b88e9369148ce3d398203d69c9e9ef8d20 --- .../server/wifi/WifiQualifiedNetworkSelector.java | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java index fa1b7ef96..ba9ec37e2 100644 --- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java @@ -309,30 +309,6 @@ public class WifiQualifiedNetworkSelector { return false; } - if (mCurrentConnectedNetwork != null - && mCurrentConnectedNetwork.networkId != currentNetwork.networkId) { - //If this happens, supplicant switch the connection silently. This is a bug - // FIXME: 11/10/15 - localLoge("supplicant switched the network silently" + " last Qualified Network" - + " Selection:" + getNetworkString(mCurrentConnectedNetwork) - + " current network:" + getNetworkString(currentNetwork)); - mCurrentConnectedNetwork = currentNetwork; - mCurrentBssid = mWifiInfo.getBSSID(); - //We do not believe lower layer choice - return true; - } - - String bssid = mWifiInfo.getBSSID(); - if (mCurrentBssid != null && !mCurrentBssid.equals(bssid)) { - //If this happens, supplicant roamed silently. This is a bug - // FIXME: 11/10/15 - localLoge("supplicant roamed silently. Last selected BSSID:" + mCurrentBssid - + " current BSSID:" + bssid); - mCurrentBssid = mWifiInfo.getBSSID(); - //We do not believe lower layer choice - return true; - } - if (!isNetworkQualified(mCurrentConnectedNetwork)) { //need not trigger Qualified Network Selection if current network is qualified localLog("Current network is not qualified"); -- cgit v1.2.3