Merge "libril: Protect against NULL unsolicited response function"

diff --cc libril/ril.cpp
index 514ac90,835da12..fbf7ee0
--- 1/libril/ril.cpp
--- 2/libril/ril.cpp
+++ b/libril/ril.cpp
@@@ -780,21 -770,14 +780,23 @@@ void RIL_onUnsolicitedResponse(int unso
      }
  
      pthread_rwlock_t *radioServiceRwlockPtr = radio::getRadioServiceRwlock((int) soc_id);
 -    int rwlockRet = pthread_rwlock_rdlock(radioServiceRwlockPtr);
 -    assert(rwlockRet == 0);
 +    int rwlockRet;
 +
 +    if (unsolResponse == RIL_UNSOL_NITZ_TIME_RECEIVED) {
 +        // get a write lock in caes of NITZ since setNitzTimeReceived() is called
 +        rwlockRet = pthread_rwlock_wrlock(radioServiceRwlockPtr);
 +        assert(rwlockRet == 0);
 +        radio::setNitzTimeReceived((int) soc_id, android::elapsedRealtime());
 +    } else {
 +        rwlockRet = pthread_rwlock_rdlock(radioServiceRwlockPtr);
 +        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);