commit 0f00af37389fd7acc547c08683d1347729a3c819
author terrycrhuang <terrycrhuang@google.com> Fri May 04 12:08:58 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 04 12:08:58 2018 -0700
tree fc6ad6df80f2638b80225b1ba7600ee48bf3d30b
parent 938b135016e6154fd3789498d560a8f0771f86d6
parent 456df1bf437a38bd1931da18b1322db9e792eb6a

ril: Change rild initial sequence to guarantee non-null function pointer before rild register its hidl service
am: 456df1bf43

Change-Id: I22ef08409bfcdbb052859f4aaada1f5f04a858c8

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);