Merge "Remove unused code"

am: fad0863829

Change-Id: Iee48190c8d07d38e51f45601d93922f8d18d72c9

diff --combined libril/ril.cpp
index 973a97c,8b2b538..52d574d
--- 1/libril/ril.cpp
--- 2/libril/ril.cpp
+++ b/libril/ril.cpp
@@@ -114,8 -114,12 +114,8 @@@ RIL_RadioFunctions s_callbacks = {0, NU
  static int s_registerCalled = 0;
  
  static pthread_t s_tid_dispatch;
 -static pthread_t s_tid_reader;
  static int s_started = 0;
  
 -static int s_fdDebug = -1;
 -static int s_fdDebug_socket2 = -1;
 -
  static int s_fdWakeupRead;
  static int s_fdWakeupWrite;
  
@@@ -124,30 -128,44 +124,30 @@@ int s_wakelock_count = 0
  static struct ril_event s_wakeupfd_event;
  
  static pthread_mutex_t s_pendingRequestsMutex = PTHREAD_MUTEX_INITIALIZER;
 -static pthread_mutex_t s_writeMutex = PTHREAD_MUTEX_INITIALIZER;
  static pthread_mutex_t s_wakeLockCountMutex = PTHREAD_MUTEX_INITIALIZER;
  static RequestInfo *s_pendingRequests = NULL;
  
  #if (SIM_COUNT >= 2)
  static pthread_mutex_t s_pendingRequestsMutex_socket2  = PTHREAD_MUTEX_INITIALIZER;
 -static pthread_mutex_t s_writeMutex_socket2            = PTHREAD_MUTEX_INITIALIZER;
  static RequestInfo *s_pendingRequests_socket2          = NULL;
  #endif
  
  #if (SIM_COUNT >= 3)
  static pthread_mutex_t s_pendingRequestsMutex_socket3  = PTHREAD_MUTEX_INITIALIZER;
 -static pthread_mutex_t s_writeMutex_socket3            = PTHREAD_MUTEX_INITIALIZER;
  static RequestInfo *s_pendingRequests_socket3          = NULL;
  #endif
  
  #if (SIM_COUNT >= 4)
  static pthread_mutex_t s_pendingRequestsMutex_socket4  = PTHREAD_MUTEX_INITIALIZER;
 -static pthread_mutex_t s_writeMutex_socket4            = PTHREAD_MUTEX_INITIALIZER;
  static RequestInfo *s_pendingRequests_socket4          = NULL;
  #endif
  
 -static struct ril_event s_wake_timeout_event;
 -static struct ril_event s_debug_event;
 -
 -
  static const struct timeval TIMEVAL_WAKE_TIMEOUT = {ANDROID_WAKE_LOCK_SECS,ANDROID_WAKE_LOCK_USECS};
  
  
  static pthread_mutex_t s_startupMutex = PTHREAD_MUTEX_INITIALIZER;
  static pthread_cond_t s_startupCond = PTHREAD_COND_INITIALIZER;
  
 -static pthread_mutex_t s_dispatchMutex = PTHREAD_MUTEX_INITIALIZER;
 -static pthread_cond_t s_dispatchCond = PTHREAD_COND_INITIALIZER;
 -
 -static RequestInfo *s_toDispatchHead = NULL;
 -static RequestInfo *s_toDispatchTail = NULL;
 -
  static UserCallbackInfo *s_last_wake_timeout_info = NULL;
  
  static void *s_lastNITZTimeData = NULL;
@@@ -195,11 -213,6 +195,6 @@@ char * RIL_getServiceName() 
      return ril_service_name;
  }
  
- extern "C"
- void RIL_setServiceName(const char * s) {
-     strncpy(ril_service_name, s, MAX_SERVICE_NAME_LENGTH);
- }
- 
  RequestInfo *
  addRequestToList(int serial, int slotId, int request) {
      RequestInfo *pRI;
@@@ -417,6 -430,9 +412,6 @@@ extern "C" void RIL_setcallbacks (cons
  
  extern "C" void
  RIL_register (const RIL_RadioFunctions *callbacks) {
 -    int ret;
 -    int flags;
 -
      RLOGI("SIM_COUNT: %d", SIM_COUNT);
  
      if (callbacks == NULL) {
@@@ -552,7 -568,9 +547,7 @@@ checkAndDequeueRequestInfoIfAck(struct 
  extern "C" void
  RIL_onRequestAck(RIL_Token t) {
      RequestInfo *pRI;
 -    int ret;
  
 -    size_t errorOffset;
      RIL_SOCKET_ID socket_id = RIL_SOCKET_1;
  
      pRI = (RequestInfo *)t;
@@@ -586,6 -604,7 +581,6 @@@ extern "C" voi
  RIL_onRequestComplete(RIL_Token t, RIL_Errno e, void *response, size_t responselen) {
      RequestInfo *pRI;
      int ret;
 -    size_t errorOffset;
      RIL_SOCKET_ID socket_id = RIL_SOCKET_1;
  
      pRI = (RequestInfo *)t;
@@@ -931,7 -950,7 +926,7 @@@ failCauseToString(RIL_Errno e) 
          case RIL_E_SIM_FULL: return "E_SIM_FULL";
          case RIL_E_NETWORK_REJECT: return "E_NETWORK_REJECT";
          case RIL_E_OPERATION_NOT_ALLOWED: return "E_OPERATION_NOT_ALLOWED";
 -        case RIL_E_EMPTY_RECORD: "E_EMPTY_RECORD";
 +        case RIL_E_EMPTY_RECORD: return "E_EMPTY_RECORD";
          case RIL_E_INVALID_SMS_FORMAT: return "E_INVALID_SMS_FORMAT";
          case RIL_E_ENCODING_ERR: return "E_ENCODING_ERR";
          case RIL_E_INVALID_SMSC_ADDRESS: return "E_INVALID_SMSC_ADDRESS";