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

Merge "scan only when wifi is enabled" into froyo

Browse Source
This commit is contained in:
Irfan Sheriff
2010-04-10 09:42:15 -07:00
committed by Android (Google) Code Review
parent 8c8185b260 2215c7f868
commit 3957b3c147
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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) {
switch (item.getItemId()) {
case MENU_ID_SCAN:
mScanner.resume();
if (mWifiManager.isWifiEnabled()) {
mScanner.resume();
}
return true;
case MENU_ID_ADVANCED:
startActivity(new Intent(this, AdvancedSettings.class));
@@ -428,6 +430,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())
return;
if (state == DetailedState.OBTAINING_IPADDR) {
mScanner.pause();
} else {