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

am 3957b3c1: Merge "scan only when wifi is enabled" into froyo

Browse Source 
Merge commit '3957b3c147673d631feef2df49f1177289e08d41' into kraken

* commit '3957b3c147673d631feef2df49f1177289e08d41':
  scan only when wifi is enabled
This commit is contained in:
Irfan Sheriff
2010-04-10 11:47:09 -07:00
committed by Android Git Automerger
parent df7d8ee6a5 3957b3c147
commit a4bbf55305
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,7 +169,9 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface.
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case MENU_ID_SCAN: case MENU_ID_SCAN:
if (mWifiManager.isWifiEnabled()) {
mScanner.resume(); mScanner.resume();
}
return true; return true;
case MENU_ID_ADVANCED: case MENU_ID_ADVANCED:
startActivity(new Intent(this, AdvancedSettings.class)); startActivity(new Intent(this, AdvancedSettings.class));
@@ -428,6 +430,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 */
if (!mWifiManager.isWifiEnabled())
return;
if (state == DetailedState.OBTAINING_IPADDR) { if (state == DetailedState.OBTAINING_IPADDR) {
mScanner.pause(); mScanner.pause();
} else { } else {