sm7325-common: location: update to LA.UM.9.12.r1-13500.01-SMxx50.QSSI12.0

location/Android.bp

@@ -16,6 +16,18 @@ GNSS_CFLAGS = [
     "-Wno-error=date-time",
 ]
 
+/* Activate the following for regression testing */
+GNSS_SANITIZE = {
+/*  address: true,*/
+    cfi: true,
+    misc_undefined: [
+        "bounds",
+        "null",
+        "unreachable",
+        "integer",
+    ],
+}
+
 /* Activate the following for debug purposes only,
    comment out for production */
 GNSS_SANITIZE_DIAG = {

location/Android.mk

@@ -1,6 +1,7 @@
 LOCAL_PATH := $(call my-dir)
-
-GNSS_SANITIZE_DIAG := cfi bounds null unreachable integer address
-
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
+GNSS_SANITIZE := cfi bounds null unreachable integer
+# Activate the following two lines for regression testing
+# GNSS_SANITIZE += address
+# GNSS_SANITIZE_DIAG := $(GNSS_SANITIZE)

location/gnsspps/Android.bp

@@ -4,6 +4,8 @@ cc_library_shared {
     name: "libgnsspps",
     vendor: true,
 
+    sanitize: GNSS_SANITIZE,
+
     shared_libs: [
         "libutils",
         "libcutils",

location/gps_vendor_product.mk

@@ -1,6 +1,10 @@
 # vendor opensource packages
 ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
 
+# Activate the following two lines for regression testing
+#GNSS_SANITIZE := address cfi alignment bounds null unreachable integer
+#GNSS_SANITIZE_DIAG := address cfi alignment bounds null unreachable integer
+
 # Add product packages
 #add QMI libraries for QMI targets
 LOC_BOARD_PLATFORM_LIST += msm8953
@@ -16,7 +20,7 @@ LOC_BOARD_PLATFORM_LIST += msmnile
 LOC_BOARD_PLATFORM_LIST += sdmshrike
 LOC_BOARD_PLATFORM_LIST += $(MSMSTEPPE)
 LOC_BOARD_PLATFORM_LIST += $(TRINKET)
-LOC_BOARD_PLATFORM_LIST += lahaina
+LOC_BOARD_PLATFORM_LIST += kona
 LOC_BOARD_PLATFORM_LIST += lito
 LOC_BOARD_PLATFORM_LIST += bengal
 LOC_BOARD_PLATFORM_LIST += atoll

location/loc_api/loc_api_v02/Android.mk

@@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_api_v02
+LOCAL_SANITIZE += $(GNSS_SANITIZE)
 # activate the following line for debug purposes only, comment out for production
 #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib

location/loc_api/loc_api_v02/LocApiV02.cpp

@@ -961,8 +961,6 @@ void LocApiV02 ::
             (time_info_current.tv_nsec)/1e6;
     }
 
-    //Use this bit to indicate the injected position source is NLP
-    location.techMask |= LOCATION_TECHNOLOGY_WIFI_BIT;
     injectPosition(location, onDemandCpi);
 }
 
@@ -1017,11 +1015,7 @@ void LocApiV02::injectPosition(const Location& location, bool onDemandCpi)
     }
 
     injectPositionReq.positionSrc_valid = 1;
-    if (LOCATION_TECHNOLOGY_WIFI_BIT & location.techMask) {
+    injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_OTHER_V02;
-        injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_WIFI_V02;
-    } else {
-        injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_OTHER_V02;
-    }
 
     if (onDemandCpi) {
         injectPositionReq.onDemandCpi_valid = 1;

location/location_api_msg_proto/src/LocationApiPbMsgConv.cpp

@@ -4361,7 +4361,7 @@ int LocationApiPbMsgConv::pbConvertToLocation(const PBLocation &pbLoc, Location
     loc.bearingAccuracy = pbLoc.bearingaccuracy();
 
     // uint32 techMask = 12; - bitwise OR of PBLocationTechnologyMask
-    loc.techMask = getLocationTechnologyMaskFromPB(pbLoc.techmask());
+    loc.techMask = getLocationFlagsMaskFromPB(pbLoc.techmask());
 
     LOC_LOGd("LocApiPB: pbLoc - Timestamp: %" PRIu64" Lat:%lf, Lon:%lf, Alt:%lf, TechMask:%x",
             loc.timestamp, loc.latitude, loc.longitude, loc.altitude, loc.techMask);

location/synergy_loc_api/Android.mk

@@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libsynergy_loc_api
+LOCAL_SANITIZE += $(GNSS_SANITIZE)
 # activate the following line for debug purposes only, comment out for production
 #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
 

location/utils/loc_socket/Android.mk

@@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_socket
+LOCAL_SANITIZE += $(GNSS_SANITIZE)
 # activate the following line for debug purposes only, comment out for production
 #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG)
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib