From 2215c7f86895ce1400e9d0cde7ec3326713a5f5b Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Fri, 9 Apr 2010 11:34:33 -0700
Subject: [PATCH] scan only when wifi is enabled

Bug: 2570611
Change-Id: Ibb51dee8ec110179ec28f9469526a1fe61e74d00
---
 src/com/android/settings/wifi/WifiSettings.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index fe31316c76b..096585473a8 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 {