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

Merge "if do not turn on wifi STA or SAP, there is no 5GHz choice for SAP config" into mnc-dev

Browse Source
This commit is contained in:
xinhe
2015-06-22 23:56:10 +00:00
committed by Android (Google) Code Review
parent 8a4e44ba92 5a0d83b11e
commit d55ddc337e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/WifiApDialog.java
View File

@@ -134,9 +134,10 @@ public class WifiApDialog extends AlertDialog implements View.OnClickListener,
ArrayAdapter <CharSequence> channelAdapter; ArrayAdapter <CharSequence> channelAdapter;
String countryCode = mWifiManager.getCountryCode(); String countryCode = mWifiManager.getCountryCode();
if (!mWifiManager.is5GHzBandSupported() || countryCode == null) { if (!mWifiManager.isDualBandSupported() || countryCode == null) {
//If no country code, 5GHz AP is forbidden //If no country code, 5GHz AP is forbidden
Log.i(TAG," NO country code, forbid 5GHz"); Log.i(TAG,(!mWifiManager.isDualBandSupported() ? "Device do not support 5GHz " :"")
+ (countryCode == null ? " NO country code" :"") + " forbid 5GHz");
channelAdapter = ArrayAdapter.createFromResource(mContext, channelAdapter = ArrayAdapter.createFromResource(mContext,
R.array.wifi_ap_band_config_2G_only, android.R.layout.simple_spinner_item); R.array.wifi_ap_band_config_2G_only, android.R.layout.simple_spinner_item);
mWifiConfig.apBand = 0; mWifiConfig.apBand = 0;