diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-04-10 09:42:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-10 09:42:15 -0700 |
| commit | 3957b3c147673d631feef2df49f1177289e08d41 (patch) | |
| tree | be8533c5f5a2d7421846df73194326a1b677cbf5 /src/com | |
| parent | 8c8185b2606f3a232e4498b1128ca7bdecc3628f (diff) | |
| parent | 2215c7f86895ce1400e9d0cde7ec3326713a5f5b (diff) | |
| download | packages_apps_Settings-3957b3c147673d631feef2df49f1177289e08d41.zip packages_apps_Settings-3957b3c147673d631feef2df49f1177289e08d41.tar.gz packages_apps_Settings-3957b3c147673d631feef2df49f1177289e08d41.tar.bz2 | |
Merge "scan only when wifi is enabled" into froyo
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index fe31316..0965854 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -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 { |