summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Harold <ncharold@gmail.com>2017-04-15 00:20:38 -0700
committerNathan Harold <ncharold@gmail.com>2017-04-15 07:51:01 +0000
commit05213b97c34f35c0084d474d8f9d7aafd13317b3 (patch)
tree539e6bf9649d4c412c04c200975b2171b2897680
parentc571e21d8510bb56d89ee4bba369999c18b4c748 (diff)
downloadandroid_frameworks_opt_net_wifi-05213b97c34f35c0084d474d8f9d7aafd13317b3.tar.gz
android_frameworks_opt_net_wifi-05213b97c34f35c0084d474d8f9d7aafd13317b3.tar.bz2
android_frameworks_opt_net_wifi-05213b97c34f35c0084d474d8f9d7aafd13317b3.zip
Disqualify non-preferred band for both 2.4 and 5GHz
The logic should disqualify the current network whenever the preferred band does not match the user preference. This change will honor the user preference for 5GHz as well as 2.4Ghz. Change-Id: I6a9fe4fe75be7f1f0f98d1b05487b8fc03f920b8
-rw-r--r--service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java
index 6f4f7bc67..e8968d5d0 100644
--- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java
@@ -325,8 +325,10 @@ public class WifiQualifiedNetworkSelector {
return false;
}
+ int currentBand = mWifiInfo.is24GHz() ?
+ WifiManager.WIFI_FREQUENCY_BAND_2GHZ : WifiManager.WIFI_FREQUENCY_BAND_5GHZ;
// Current network band must match with user preference selection
- if (mWifiInfo.is24GHz() && (mUserPreferedBand != WifiManager.WIFI_FREQUENCY_BAND_2GHZ)) {
+ if (currentBand != mUserPreferedBand) {
localLog("Current band does not match user preference. Start Qualified Network"
+ " Selection Current band = " + (mWifiInfo.is24GHz() ? "2.4GHz band"
: "5GHz band") + "UserPreference band = " + mUserPreferedBand);