commit 169d02b508b3f5f3859218a4ed57006606c01236
author Shuo Qian <shuoq@google.com> Wed Sep 13 22:43:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 13 22:43:55 2017 +0000
tree 235f74d54bf60d6afbcf1b41bf7b04e9faf3e8ea
parent 49013426969c13071ac1ba31be7913e1219f56b9
parent 35629b94bddf2c4d3903291899294594ded16817

Merge "Fix Sap Service"
am: 35629b94bd

Change-Id: I87110a6484f9713c71dff1e8a2581b3a9d15de51

libril/sap_service.cpp

diff --git a/libril/sap_service.cpp b/libril/sap_service.cpp
index 85ff903..b945174 100644
--- a/libril/sap_service.cpp
+++ b/libril/sap_service.cpp
@@ -775,6 +775,13 @@
         return;
     }
 
+    if (messagePtr == NULL) {
+        RLOGE("processResponse: *messagePtr == NULL; msgId = %d; msgType = %d",
+                msgId, msgType);
+        sapImpl->sendFailedResponse(msgId, rsp->token, 0);
+        return;
+    }
+
     RLOGD("processResponse: sapCallback != NULL; msgId = %d; msgType = %d",
             msgId, msgType);