commit a4b1baddf4ecfff1c9a509730f0e462208923a4f
author android-build-team Robot <android-build-team-robot@google.com> Sun May 06 07:22:36 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun May 06 07:22:36 2018 +0000
tree 043031240d12ec6ceb137c23703f4c9a3c50da6e
parent df2c40779020256be4db60ae89e06bcbcd94495a
parent 456df1bf437a38bd1931da18b1322db9e792eb6a

Snap for 4765094 from 456df1bf437a38bd1931da18b1322db9e792eb6a to pi-release

Change-Id: Ib69e8d05717f20cf99207b15d033b49da57e9462

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() {