BOBtheBlinker/android_device_motorola_sm6375-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm7325-common: update location to LA.UM.9.14.r1-20000-LAHAINA.QSSI13.0

Browse source 
Change-Id: I1a8efd6c0bd3649de877a08b193914ba6d3d4304
This commit is contained in:
SGCMarkus 2022-08-18 20:32:04 +02:00 • committed by Nolen Johnson
parent 9f3feb2522
commit e7a9456ecd
9 changed files with 24 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
location/loc_api/loc_api_v02/Android.mk
View file

@ -3,7 +3,6 @@ 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
@ -33,8 +32,8 @@ LOCAL_CFLAGS += \
## Includes
LOCAL_C_INCLUDES := \
$(TARGET_OUT_HEADERS)/qmi-framework/inc \
$(TARGET_OUT_HEADERS)/qmi/inc
$(TARGET_OUT_HEADERS)/qmi-framework/inc
LOCAL_HEADER_LIBRARIES := \
libloc_core_headers \
libgps.utils_headers \

25
location/loc_api/loc_api_v02/LocApiV02.cpp
View file

@ -961,6 +961,8 @@ 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);
}
@ -1015,7 +1017,11 @@ void LocApiV02::injectPosition(const Location& location, bool onDemandCpi)
}
injectPositionReq.positionSrc_valid = 1;
injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_OTHER_V02;
if (LOCATION_TECHNOLOGY_WIFI_BIT & location.techMask) {
injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_WIFI_V02;
} else {
injectPositionReq.positionSrc = eQMI_LOC_POSITION_SRC_OTHER_V02;
}
if (onDemandCpi) {
injectPositionReq.onDemandCpi_valid = 1;
@ -2623,6 +2629,17 @@ void LocApiV02 :: reportPosition (
location.gpsLocation.flags |= LOC_GPS_LOCATION_HAS_LAT_LONG;
location.gpsLocation.latitude = location_report_ptr->latitude;
location.gpsLocation.longitude = location_report_ptr->longitude;
if (location_report_ptr->altitudeWrtEllipsoid_valid) {
LocApiProxyBase* locApiProxyObj = getLocApiProxy();
float geoidalSeparation = 0.0;
if (nullptr != locApiProxyObj) {
geoidalSeparation = locApiProxyObj->getGeoidalSeparation(
location_report_ptr->latitude, location_report_ptr->longitude);
locationExtended.altitudeMeanSeaLevel =
location_report_ptr->altitudeWrtEllipsoid - geoidalSeparation;
locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_ALTITUDE_MEAN_SEA_LEVEL;
}
}
} else {
LocApiBase::reportData(dataNotify, msInWeek);
}
@ -2719,12 +2736,6 @@ void LocApiV02 :: reportPosition (
locationExtended.vdop = location_report_ptr->DOP.VDOP;
}
if (location_report_ptr->altitudeWrtMeanSeaLevel_valid)
{
locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_ALTITUDE_MEAN_SEA_LEVEL;
locationExtended.altitudeMeanSeaLevel = location_report_ptr->altitudeWrtMeanSeaLevel;
}
if (location_report_ptr->vertUnc_valid)
{
locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_VERT_UNC;