diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-09-06 12:08:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 12:08:03 -0700 |
| commit | c6680fd1d490d7174e7e5bad4780186aff40214f (patch) | |
| tree | 6716fd0ab6e0a1f26094a876f787d4c0ccc50dd2 /src/com | |
| parent | a54d1912755fe96f76b18209448eb8b351d62711 (diff) | |
| parent | 655900e028888376239a416c5a5283f62141f828 (diff) | |
| download | packages_apps_settings-c6680fd1d490d7174e7e5bad4780186aff40214f.zip packages_apps_settings-c6680fd1d490d7174e7e5bad4780186aff40214f.tar.gz packages_apps_settings-c6680fd1d490d7174e7e5bad4780186aff40214f.tar.bz2 | |
Merge "Provide help to turn off auto network disable"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 2cbe260..8d4e77b 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -31,6 +31,7 @@ import android.net.wifi.WifiConfiguration.AuthAlgorithm; import android.net.wifi.WifiConfiguration.IpAssignment; import android.net.wifi.WifiConfiguration.KeyMgmt; import android.net.wifi.WifiConfiguration.ProxySettings; +import android.net.wifi.WifiConfiguration.Status; import android.net.wifi.WifiInfo; import android.net.wifi.WpsConfiguration; import android.net.wifi.WpsConfiguration.Setup; @@ -216,6 +217,13 @@ public class WifiConfigController implements TextWatcher, } else { mProxySettingsSpinner.setSelection(PROXY_NONE); } + + if (config.status == Status.DISABLED && + config.disableReason == WifiConfiguration.DISABLED_DNS_FAILURE) { + addRow(group, R.string.wifi_disabled_heading, + context.getString(R.string.wifi_disabled_help)); + } + } /* Show network setup options only for a new network */ |