PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert back to isDualBandSupported() for Wifi tethering.

Browse Source 
This is needed to maintain OEM compatibility

Bug: 33160120
Test: robotests
Change-Id: Ic302969d33f32da72aee47d29615a250d3d924e2
This commit is contained in:
Rebecca Silberstein
2017-09-08 01:02:23 -07:00
committed by Fan Zhang
parent 31d8a89220
commit d52c17c765
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.wifi.tether;
import static android.net.wifi.WifiConfiguration.AP_BAND_2GHZ;
import static android.net.wifi.WifiConfiguration.AP_BAND_5GHZ;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import android.support.v7.preference.ListPreference;
@@ -24,9 +27,6 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import static android.net.wifi.WifiConfiguration.AP_BAND_2GHZ;
import static android.net.wifi.WifiConfiguration.AP_BAND_5GHZ;
public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController {
private static final String PREF_KEY = "wifi_tether_network_ap_band";
@@ -41,10 +41,14 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen
super(context, listener);
mBandEntries = mContext.getResources().getStringArray(R.array.wifi_ap_band_config_full);
final WifiConfiguration config = mWifiManager.getWifiApConfiguration();
if (config != null) {
if (config == null) {
mBandIndex = 0;
} else if (is5GhzBandSupported()) {
mBandIndex = config.apBand;
} else {
mBandIndex = 0;
config.apBand = 0;
mWifiManager.setWifiApConfiguration(config);
mBandIndex = config.apBand;
}
}
@@ -77,10 +81,11 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen
}
private boolean is5GhzBandSupported() {
if (mBandIndex > 0) {
return true;
final String countryCode = mWifiManager.getCountryCode();
if (!mWifiManager.isDualBandSupported() || countryCode == null) {
return false;
}
return mWifiManager.is5GHzBandSupported();
return true;
}
public int getBandIndex() {