diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-04-17 09:28:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-17 09:28:21 -0700 |
| commit | ea87b6d75cf04051b327c89338951c7d1377c16f (patch) | |
| tree | 5b82e7a6e3a4f8808df53daeee3ce479790516f1 /src | |
| parent | 82164c365a01af8e3535c0e67b1fc3ed479391f0 (diff) | |
| parent | e81497095bd97a14db07d870cb9f57aa0c220078 (diff) | |
| download | packages_apps_Settings-ea87b6d75cf04051b327c89338951c7d1377c16f.zip packages_apps_Settings-ea87b6d75cf04051b327c89338951c7d1377c16f.tar.gz packages_apps_Settings-ea87b6d75cf04051b327c89338951c7d1377c16f.tar.bz2 | |
Merge "Stop scanning after errors" into froyo
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); |