1 files changed, 6 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/util/WifiAsyncChannel.java b/service/java/com/android/server/wifi/util/WifiAsyncChannel.java
index 08025e3ea..4526d68a4 100644
--- a/service/java/com/android/server/wifi/util/WifiAsyncChannel.java
+++ b/service/java/com/android/server/wifi/util/WifiAsyncChannel.java
@@ -90,10 +90,12 @@ public class WifiAsyncChannel extends AsyncChannel {
             .c(msg.what)
             .flush();
         Message replyMessage = super.sendMessageSynchronously(msg);
-        getOrInitLog().trace("sendMessageSynchronously.recv message=% sendingUid=%")
-            .c(replyMessage.what)
-            .c(replyMessage.sendingUid)
-            .flush();
+        if (replyMessage != null) {
+            getOrInitLog().trace("sendMessageSynchronously.recv message=% sendingUid=%")
+                    .c(replyMessage.what)
+                    .c(replyMessage.sendingUid)
+                    .flush();
+        }
         return replyMessage;
     }