commit 938b135016e6154fd3789498d560a8f0771f86d6
author Steven Moreland <smoreland@google.com> Tue Mar 27 04:46:37 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 27 04:46:37 2018 +0000
tree b7e113b668c80910d61fdbe75f9026f27c57cc04
parent bae52d8f19ffc1c40e84fb76d6e3829348ecfe54
parent ac71c57c88050f2bc46ea75320f03c62c708c91a

Merge "Add DISABLE_RILD_OEM_HOOK." into pi-dev
am: ac71c57c88

Change-Id: I490e1d14b7575ba8628243db67f63912dd35c24e

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 514ac90..fbf7ee0 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -792,9 +792,11 @@
         assert(rwlockRet == 0);
     }
 
-    ret = s_unsolResponses[unsolResponseIndex].responseFunction(
-            (int) soc_id, responseType, 0, RIL_E_SUCCESS, const_cast<void*>(data),
-            datalen);
+    if (s_unsolResponses[unsolResponseIndex].responseFunction) {
+        ret = s_unsolResponses[unsolResponseIndex].responseFunction(
+                (int) soc_id, responseType, 0, RIL_E_SUCCESS, const_cast<void*>(data),
+                datalen);
+    }
 
     rwlockRet = pthread_rwlock_unlock(radioServiceRwlockPtr);
     assert(rwlockRet == 0);