PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop scanning after errors" into froyo

Browse Source
This commit is contained in:
Irfan Sheriff
2010-04-17 09:28:21 -07:00
committed by Android (Google) Code Review
parent 82164c365a e81497095b
commit ea87b6d75c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -431,8 +431,10 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface.
private void updateConnectionState(DetailedState state) { private void updateConnectionState(DetailedState state) {
/* sticky broadcasts can call this when wifi is disabled */ /* sticky broadcasts can call this when wifi is disabled */
if (!mWifiManager.isWifiEnabled()) if (!mWifiManager.isWifiEnabled()) {
mScanner.pause();
return; return;
}
if (state == DetailedState.OBTAINING_IPADDR) { if (state == DetailedState.OBTAINING_IPADDR) {
mScanner.pause(); mScanner.pause();
@@ -489,6 +491,7 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface.
mRetry = 0; mRetry = 0;
Toast.makeText(WifiSettings.this, R.string.wifi_fail_to_scan, Toast.makeText(WifiSettings.this, R.string.wifi_fail_to_scan,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
return;
} }
mAccessPoints.setProgress(mRetry != 0); mAccessPoints.setProgress(mRetry != 0);
sendEmptyMessageDelayed(0, 6000); sendEmptyMessageDelayed(0, 6000);