rild: Compensate for lack of CELL_INFO_LIST support

 * Lack of support for CELL_INFO_LIST throws off the command ids of
   pre-MR2 RILs. Adjust accordingly.

Change-Id: I08a7e2cd42a69a9f6003a33a6f07b01588e0ac5a

1 files changed, 41 insertions, 2 deletions

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index baf56b6..f904ccd 100755
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -3645,6 +3645,7 @@ typedef struct {
  */
 #define RIL_REQUEST_VOICE_RADIO_TECH 108
 
+#ifndef RIL_NO_CELL_INFO_LIST
 /**
  * RIL_REQUEST_GET_CELL_INFO_LIST
  *
@@ -3678,6 +3679,7 @@ typedef struct {
  *  GENERIC_FAILURE
  */
 #define RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE 110
+#endif
 
 /**
  * RIL_REQUEST_IMS_REGISTRATION_STATE
@@ -3701,7 +3703,11 @@ typedef struct {
  *  RADIO_NOT_AVAILABLE
  *  GENERIC_FAILURE
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_REQUEST_IMS_REGISTRATION_STATE 111
+#else
+#define RIL_REQUEST_IMS_REGISTRATION_STATE 109
+#endif
 
 /**
  * RIL_REQUEST_IMS_SEND_SMS
@@ -3724,7 +3730,11 @@ typedef struct {
  *  GENERIC_FAILURE
  *
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_REQUEST_IMS_SEND_SMS 112
+#else
+#define RIL_REQUEST_IMS_SEND_SMS 110
+#endif
 
 /**
  * RIL_REQUEST_GET_DATA_CALL_PROFILE
@@ -3747,8 +3757,12 @@ typedef struct {
  *  RIL_E_DATA_CALL_PROFILE_NOT_AVAILABLE
  *
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_REQUEST_GET_DATA_CALL_PROFILE 113
-
+#else
+#define RIL_REQUEST_GET_DATA_CALL_PROFILE 111
+#endif
+ 
 /**
  * RIL_REQUEST_SET_UICC_SUBSCRIPTION
  *
@@ -3764,7 +3778,11 @@ typedef struct {
  *  SUBSCRIPTION_NOT_SUPPORTED
  *
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_REQUEST_SET_UICC_SUBSCRIPTION  114
+#else
+#define RIL_REQUEST_SET_UICC_SUBSCRIPTION  118
+#endif
 
 /**
  *  RIL_REQUEST_SET_DATA_SUBSCRIPTION
@@ -3781,7 +3799,11 @@ typedef struct {
  *  GENERIC_FAILURE
  *
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_REQUEST_SET_DATA_SUBSCRIPTION  115
+#else
+#define RIL_REQUEST_SET_DATA_SUBSCRIPTION  119
+#endif
 
 /**
  * RIL_REQUEST_GET_UICC_SUBSCRIPTION
@@ -3799,7 +3821,11 @@ typedef struct {
  *  GENERIC_FAILURE
  *
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_REQUEST_GET_UICC_SUBSCRIPTION 116
+#else
+#define RIL_REQUEST_GET_UICC_SUBSCRIPTION 120
+#endif
 
 /**
  * RIL_REQUEST_GET_DATA_SUBSCRIPTION
@@ -3819,8 +3845,11 @@ typedef struct {
  *  GENERIC_FAILURE
  *
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_REQUEST_GET_DATA_SUBSCRIPTION 117
-
+#else
+#define RIL_REQUEST_GET_DATA_SUBSCRIPTION 121
+#endif
 /***********************************************************************/
 
 
@@ -4298,6 +4327,7 @@ typedef struct {
  */
 #define RIL_UNSOL_VOICE_RADIO_TECH_CHANGED 1035
 
+#ifndef RIL_NO_CELL_INFO_LIST
 /**
  * RIL_UNSOL_CELL_INFO_LIST
  *
@@ -4309,6 +4339,7 @@ typedef struct {
  * "response" is an array of RIL_CellInfo.
  */
 #define RIL_UNSOL_CELL_INFO_LIST 1036
+#endif
 
 /**
  * RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED
@@ -4322,7 +4353,11 @@ typedef struct {
  * "data" is NULL
  *
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED 1037
+#else
+#define RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED 1036
+#endif
 
 /**
  * RIL_UNSOL_RESPONSE_TETHERED_MODE_STATE_CHANGED
@@ -4332,7 +4367,11 @@ typedef struct {
  *
  * "data" is an int 0 - tethered mode off , 1 - tethered mode on
  */
+#ifndef RIL_NO_CELL_INFO_LIST
 #define RIL_UNSOL_RESPONSE_TETHERED_MODE_STATE_CHANGED 1038
+#else
+#define RIL_UNSOL_RESPONSE_TETHERED_MODE_STATE_CHANGED 1037
+#endif
 
 /**
  * RIL_UNSOL_ON_SS