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_service.cpp

diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index 47b0b9c..b8862dc 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -8500,6 +8500,9 @@
     simCount = SIM_COUNT;
     #endif
 
+    s_vendorFunctions = callbacks;
+    s_commands = commands;
+
     configureRpcThreadpool(1, true /* callerWillJoin */);
     for (int i = 0; i < simCount; i++) {
         pthread_rwlock_t *radioServiceRwlockPtr = getRadioServiceRwlock(i);
@@ -8521,9 +8524,6 @@
         ret = pthread_rwlock_unlock(radioServiceRwlockPtr);
         assert(ret == 0);
     }
-
-    s_vendorFunctions = callbacks;
-    s_commands = commands;
 }
 
 void rilc_thread_pool() {