Merge "Update LOC API source and header files"

loc_api/libloc_api_50001/loc.h

@@ -96,7 +96,8 @@ typedef uint32_t LocPosTechMask;
 #define LOC_POS_TECH_MASK_SENSORS ((LocPosTechMask)0x00000008)
 #define LOC_POS_TECH_MASK_REFERENCE_LOCATION ((LocPosTechMask)0x00000010)
 #define LOC_POS_TECH_MASK_INJECTED_COARSE_POSITION ((LocPosTechMask)0x00000020)
-
+#define LOC_POS_TECH_MASK_AFLT ((LocPosTechMask)0x00000040)
+#define LOC_POS_TECH_MASK_HYBRID ((LocPosTechMask)0x00000080)
 void loc_ulp_msg_sender(void* loc_eng_data_p, void* msg);
 
 #ifdef __cplusplus

loc_api/libloc_api_50001/loc_eng.cpp

@@ -1600,7 +1600,8 @@ static void loc_eng_deferred_action_thread(void* arg)
                                ((LOCATION_HAS_SOURCE_INFO & rpMsg->location.gpsLocation.flags) &&
                                 ULP_LOCATION_IS_FROM_HYBRID == rpMsg->location.position_source) ||
                                ((LOC_POS_TECH_MASK_SATELLITE & rpMsg->technology_mask) ||
-                                (LOC_POS_TECH_MASK_SENSORS & rpMsg->technology_mask)))) ||
+                                (LOC_POS_TECH_MASK_SENSORS & rpMsg->technology_mask)   ||
+                                (LOC_POS_TECH_MASK_HYBRID & rpMsg->technology_mask)))) ||
                              (LOC_SESS_INTERMEDIATE == loc_eng_data_p->intermediateFix &&
                               !((rpMsg->location.gpsLocation.flags & GPS_LOCATION_HAS_ACCURACY) &&
                                 (gps_conf.ACCURACY_THRES != 0) &&

loc_api/loc_api_v02/loc_api_v02_client.c

@@ -1647,6 +1647,8 @@ static bool validateRequest(
     case QMI_LOC_GET_SENSOR_CONTROL_CONFIG_REQ_V02:
     case QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02:
     case QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_REQ_V02:
+    case QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02:
+    case QMI_LOC_GET_SUPPORTED_FIELDS_REQ_V02:
     {
       noPayloadFlag = true;
       break;

loc_api/loc_api_v02/loc_api_v02_log.c

@@ -237,7 +237,11 @@ static loc_name_val_s_type loc_v02_event_name[] =
     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)
+    NAME_VAL(QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02),
+    NAME_VAL(QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02),
+    NAME_VAL(QMI_LOC_GET_SUPPORTED_MSGS_RESP_V02),
+    NAME_VAL(QMI_LOC_GET_SUPPORTED_FIELDS_REQ_V02),
+    NAME_VAL(QMI_LOC_GET_SUPPORTED_FIELDS_RESP_V02),
 };
 static int loc_v02_event_num = sizeof(loc_v02_event_name) / sizeof(loc_name_val_s_type);