Fix crash when wifi monitor dispatches a message with no handler

Bug: 27705420
Change-Id: I68708215ccd0a0aa1b6f331122d3bcd54ce7669e

1 files changed, 9 insertions, 7 deletions

diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java
index 8e367327e..2c1bde10d 100644
--- a/service/java/com/android/server/wifi/WifiMonitor.java
+++ b/service/java/com/android/server/wifi/WifiMonitor.java
@@ -681,13 +681,15 @@ public class WifiMonitor {
             if (isMonitoring(iface)) {
                 boolean firstHandler = true;
                 Set<Handler> ifaceWhatHandlers = ifaceHandlers.get(message.what);
-                for (Handler handler : ifaceWhatHandlers) {
-                    if (firstHandler) {
-                        firstHandler = false;
-                        sendMessage(handler, message);
-                    }
-                    else {
-                        sendMessage(handler, Message.obtain(message));
+                if (ifaceWhatHandlers != null) {
+                    for (Handler handler : ifaceWhatHandlers) {
+                        if (firstHandler) {
+                            firstHandler = false;
+                            sendMessage(handler, message);
+                        }
+                        else {
+                            sendMessage(handler, Message.obtain(message));
+                        }
                     }
                 }
             } else {