diff options
| author | xinhe <xinhe@google.com> | 2015-07-13 15:26:45 -0700 |
|---|---|---|
| committer | xinhe <xinhe@google.com> | 2015-07-14 14:39:43 -0700 |
| commit | cbdcca6cf6326af64b13832b797cf28250e0a417 (patch) | |
| tree | 5705ed03d822603a47138804215bac689103805d /src/com/android/settings/wifi | |
| parent | 7ba46433aefad363a1d2e75d4a12f2886c6d0315 (diff) | |
| download | packages_apps_Settings-cbdcca6cf6326af64b13832b797cf28250e0a417.zip packages_apps_Settings-cbdcca6cf6326af64b13832b797cf28250e0a417.tar.gz packages_apps_Settings-cbdcca6cf6326af64b13832b797cf28250e0a417.tar.bz2 | |
Need to disable 5GHz bands for WiFi tethering in Japan
b/22396383
Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
Diffstat (limited to 'src/com/android/settings/wifi')
| -rw-r--r-- | src/com/android/settings/wifi/WifiApEnabler.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java index bf2fa38..741c4a7 100644 --- a/src/com/android/settings/wifi/WifiApEnabler.java +++ b/src/com/android/settings/wifi/WifiApEnabler.java @@ -47,8 +47,15 @@ public class WifiApEnabler { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(action)) { - handleWifiApStateChanged(intent.getIntExtra( - WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED)); + int state = intent.getIntExtra( + WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED); + if (state == WifiManager.WIFI_AP_STATE_FAILED) { + int reason = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_FAILURE_REASON, + WifiManager.SAP_START_FAILURE_GENERAL); + handleWifiApStateChanged(state, reason); + } else { + handleWifiApStateChanged(state, WifiManager.SAP_START_FAILURE_GENERAL); + } } else if (ConnectivityManager.ACTION_TETHER_STATE_CHANGED.equals(action)) { ArrayList<String> available = intent.getStringArrayListExtra( ConnectivityManager.EXTRA_AVAILABLE_TETHER); @@ -142,7 +149,7 @@ public class WifiApEnabler { } } - private void handleWifiApStateChanged(int state) { + private void handleWifiApStateChanged(int state, int reason) { switch (state) { case WifiManager.WIFI_AP_STATE_ENABLING: mSwitch.setSummary(R.string.wifi_tether_starting); @@ -169,7 +176,11 @@ public class WifiApEnabler { break; default: mSwitch.setChecked(false); - mSwitch.setSummary(R.string.wifi_error); + if (reason == WifiManager.SAP_START_FAILURE_NO_CHANNEL) { + mSwitch.setSummary(R.string.wifi_sap_no_channel_error); + } else { + mSwitch.setSummary(R.string.wifi_error); + } enableWifiSwitch(); } } |