diff options
| author | Mitchell Wills <mwills@google.com> | 2016-03-16 17:20:39 -0700 |
|---|---|---|
| committer | Mitchell Wills <mwills@google.com> | 2016-03-16 17:22:14 -0700 |
| commit | 18456db02b67d04d9e601aca68538b64c7a374f8 (patch) | |
| tree | 7afa9a86d9e01c7676559d97b97a065d0e8ac435 /service/java/com/android/server/wifi/WifiMonitor.java | |
| parent | 12a73dbc70d547ea87048209fd84d9dace01be17 (diff) | |
| download | android_frameworks_opt_net_wifi-18456db02b67d04d9e601aca68538b64c7a374f8.tar.gz android_frameworks_opt_net_wifi-18456db02b67d04d9e601aca68538b64c7a374f8.tar.bz2 android_frameworks_opt_net_wifi-18456db02b67d04d9e601aca68538b64c7a374f8.zip | |
Fix crash when wifi monitor dispatches a message with no handler
Bug: 27705420
Change-Id: I68708215ccd0a0aa1b6f331122d3bcd54ce7669e
Diffstat (limited to 'service/java/com/android/server/wifi/WifiMonitor.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMonitor.java | 16 |
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 { |