summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/wifi/WifiSettings.java5
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);