Merge "Fix Sap Service"
diff --git a/libril/sap_service.cpp b/libril/sap_service.cpp
index 2ac6745..ab43ee8 100644
--- a/libril/sap_service.cpp
+++ b/libril/sap_service.cpp
@@ -776,6 +776,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);