1 files changed, 6 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java
index 7ececb9e5..9d7780ca8 100755
--- a/service/java/com/android/server/wifi/WifiMonitor.java
+++ b/service/java/com/android/server/wifi/WifiMonitor.java
@@ -686,7 +686,7 @@ public class WifiMonitor {
                     return false;
                 } else {
                     if (DBG) Log.d(TAG, "Dropping event because (" + iface + ") is stopped");
-                    return true;
+                    return false;
                 }
             } else {
                 if (DBG) Log.d(TAG, "Sending to all monitors because there's no matching iface");
@@ -732,6 +732,11 @@ public class WifiMonitor {
         public void run() {
             //noinspection InfiniteLoopStatement
             for (;;) {
+                if (!mWifiMonitorSingleton.mConnected) {
+                    Log.d(TAG, "MonitorThread exit because mConnected is false");
+                    break;
+                }
+
                 String eventStr = mWifiNative.waitForEvent();
 
                 // Skip logging the common but mostly uninteresting scan-results event