diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-02 00:57:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-02 00:57:50 +0000 |
| commit | 4aef2aafbec238bd33c1f8d64c0ecf6134a55bb0 (patch) | |
| tree | fb3209619914978d4987e47148c4e949ef2d0afe | |
| parent | 7b0164f58cce4dc294bfe5604c05fc91b386647b (diff) | |
| parent | 0f8285e1e039af673f0cc3a3d76ed071da875d79 (diff) | |
Merge "[WIFI] Add null check before variable access to prevent an APR" into pi-dev
| -rw-r--r-- | service/java/com/android/server/wifi/util/WifiAsyncChannel.java | 10 |
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; } |