diff options
author | Irfan Sheriff <isheriff@google.com> | 2010-04-17 09:38:26 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-17 09:38:26 -0700 |
commit | e7879010e3dbfd2db193055c60c9825004a3a51a (patch) | |
tree | a0afa1bfdc811e10fd1d16f8c81460e152cc9cb4 /src | |
parent | 6fc1ded00b1d724a69f49a3505a63b1c67d57284 (diff) | |
parent | ea87b6d75cf04051b327c89338951c7d1377c16f (diff) | |
download | packages_apps_Settings-e7879010e3dbfd2db193055c60c9825004a3a51a.zip packages_apps_Settings-e7879010e3dbfd2db193055c60c9825004a3a51a.tar.gz packages_apps_Settings-e7879010e3dbfd2db193055c60c9825004a3a51a.tar.bz2 |
am ea87b6d7: Merge "Stop scanning after errors" into froyo
Merge commit 'ea87b6d75cf04051b327c89338951c7d1377c16f' into kraken
* commit 'ea87b6d75cf04051b327c89338951c7d1377c16f':
Stop scanning after errors
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 0965854..2eca1d7 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -431,8 +431,10 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface. private void updateConnectionState(DetailedState state) { /* sticky broadcasts can call this when wifi is disabled */ - if (!mWifiManager.isWifiEnabled()) + if (!mWifiManager.isWifiEnabled()) { + mScanner.pause(); return; + } if (state == DetailedState.OBTAINING_IPADDR) { mScanner.pause(); @@ -489,6 +491,7 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface. mRetry = 0; Toast.makeText(WifiSettings.this, R.string.wifi_fail_to_scan, Toast.LENGTH_LONG).show(); + return; } mAccessPoints.setProgress(mRetry != 0); sendEmptyMessageDelayed(0, 6000); |