Merge "loc api v02 update"

loc_api/loc_api_v02/loc_api_v02_client.c

@@ -406,7 +406,16 @@ static locClientRespIndTableStructT locClientRespIndTable[]= {
 
    //Pedomete Report
    { QMI_LOC_PEDOMETER_REPORT_IND_V02,
-     sizeof(qmiLocPedometerReportIndMsgT_v02)}
+     sizeof(qmiLocPedometerReportIndMsgT_v02)},
+
+   { QMI_LOC_INJECT_WCDMA_CELL_INFO_IND_V02,
+     sizeof(qmiLocInjectWCDMACellInfoIndMsgT_v02)},
+
+   { QMI_LOC_INJECT_TDSCDMA_CELL_INFO_IND_V02,
+     sizeof(qmiLocInjectTDSCDMACellInfoIndMsgT_v02)},
+
+   { QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02,
+     sizeof(qmiLocInjectSubscriberIDIndMsgT_v02)}
 };
 
 
@@ -1056,6 +1065,9 @@ static bool locClientHandleIndication(
     case QMI_LOC_INJECT_GSM_CELL_INFO_IND_V02:
     case QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_IND_V02:
     case QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_IND_V02:
+    case QMI_LOC_INJECT_WCDMA_CELL_INFO_IND_V02:
+    case QMI_LOC_INJECT_TDSCDMA_CELL_INFO_IND_V02:
+    case QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02:
     {
       status = true;
       break;
@@ -1599,6 +1611,24 @@ static bool validateRequest(
       break;
     }
 
+    case QMI_LOC_INJECT_WCDMA_CELL_INFO_REQ_V02:
+    {
+      *pOutLen = sizeof(qmiLocInjectWCDMACellInfoReqMsgT_v02);
+      break;
+    }
+
+    case QMI_LOC_INJECT_TDSCDMA_CELL_INFO_REQ_V02:
+    {
+      *pOutLen = sizeof(qmiLocInjectTDSCDMACellInfoReqMsgT_v02);
+      break;
+    }
+
+    case QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02:
+    {
+      *pOutLen = sizeof(qmiLocInjectSubscriberIDReqMsgT_v02);
+      break;
+    }
+
     // ALL requests with no payload
     case QMI_LOC_GET_SERVICE_REVISION_REQ_V02:
     case QMI_LOC_GET_FIX_CRITERIA_REQ_V02:

loc_api/loc_api_v02/loc_api_v02_client.h

@@ -610,6 +610,10 @@ typedef union
          To send this request, set the reqId field in locClientSendReq() to
          QMI_LOC_PEDOMETER_REPORT_REQ_V02 */
 
+    const qmiLocInjectWCDMACellInfoReqMsgT_v02 *pInjectWCDMACellInfoReq;
+    const qmiLocInjectTDSCDMACellInfoReqMsgT_v02 *pInjectTDSCDMACellInfoReq;
+    const qmiLocInjectSubscriberIDReqMsgT_v02 *pInjectSubscriberIDReq;
+
 }locClientReqUnionType;
 
 
@@ -1152,6 +1156,10 @@ typedef union
         The respIndId field in the response indication callback is set to
         QMI_LOC_PEDOMETER_REPORT_IND_V02. */
 
+    const qmiLocInjectWCDMACellInfoIndMsgT_v02 *pInjectWCDMACellInfoInd;
+    const qmiLocInjectTDSCDMACellInfoIndMsgT_v02 *pInjectTDSCDMACellInfoInd;
+    const qmiLocInjectSubscriberIDIndMsgT_v02 *pInjectSubscriberIDInd;
+
 }locClientRespIndUnionType;
 
 /** @} */ /* end_addtogroup data_types */

loc_api/loc_api_v02/loc_api_v02_log.c

@@ -228,7 +228,16 @@ static loc_name_val_s_type loc_v02_event_name[] =
     NAME_VAL(QMI_LOC_EVENT_MOTION_DATA_CONTROL_IND_V02),
     NAME_VAL(QMI_LOC_PEDOMETER_REPORT_REQ_V02),
     NAME_VAL(QMI_LOC_PEDOMETER_REPORT_RESP_V02),
-    NAME_VAL(QMI_LOC_PEDOMETER_REPORT_IND_V02)
+    NAME_VAL(QMI_LOC_PEDOMETER_REPORT_IND_V02),
+    NAME_VAL(QMI_LOC_INJECT_WCDMA_CELL_INFO_REQ_V02),
+    NAME_VAL(QMI_LOC_INJECT_WCDMA_CELL_INFO_RESP_V02),
+    NAME_VAL(QMI_LOC_INJECT_WCDMA_CELL_INFO_IND_V02),
+    NAME_VAL(QMI_LOC_INJECT_TDSCDMA_CELL_INFO_REQ_V02),
+    NAME_VAL(QMI_LOC_INJECT_TDSCDMA_CELL_INFO_RESP_V02),
+    NAME_VAL(QMI_LOC_INJECT_TDSCDMA_CELL_INFO_IND_V02),
+    NAME_VAL(QMI_LOC_INJECT_SUBSCRIBER_ID_REQ_V02),
+    NAME_VAL(QMI_LOC_INJECT_SUBSCRIBER_ID_RESP_V02),
+    NAME_VAL(QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02)
 };
 static int loc_v02_event_num = sizeof(loc_v02_event_name) / sizeof(loc_name_val_s_type);