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

* commit 'd55ddc337edd7236a7024602b7970e146f9489db':
  if do not turn on wifi STA or SAP, there is no 5GHz choice  for SAP config
This commit is contained in:
xinhe
2015-06-23 00:20:09 +00:00
committed by Android Git Automerger

View File

@@ -134,9 +134,10 @@ public class WifiApDialog extends AlertDialog implements View.OnClickListener,
ArrayAdapter <CharSequence> channelAdapter;
String countryCode = mWifiManager.getCountryCode();
if (!mWifiManager.is5GHzBandSupported() || countryCode == null) {
if (!mWifiManager.isDualBandSupported() || countryCode == null) {
//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,
R.array.wifi_ap_band_config_2G_only, android.R.layout.simple_spinner_item);
mWifiConfig.apBand = 0;