Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.083'
Bug: 124397977
Change-Id: I8a555230418c7d36d503f403351b01f585c06543
diff --git a/core/Android.mk b/core/Android.mk
index e1ac45a..859ac03 100644
--- a/core/Android.mk
+++ b/core/Android.mk
@@ -20,7 +20,8 @@
libutils \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
@@ -33,7 +34,8 @@
LOCAL_CFLAGS += \
-fno-short-enums \
-D_ANDROID_ \
- -Wno-unused-parameter
+ -Wno-unused-parameter \
+ -Wno-error
LOCAL_C_INCLUDES:= \
$(TARGET_OUT_HEADERS)/gps.utils
diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk
index 74d5423..4992540 100644
--- a/loc_api/libloc_api_50001/Android.mk
+++ b/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8084/core/Android.mk b/msm8084/core/Android.mk
index c7ea75c..e1df540 100644
--- a/msm8084/core/Android.mk
+++ b/msm8084/core/Android.mk
@@ -15,7 +15,8 @@
liblog \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
diff --git a/msm8084/loc_api/libloc_api_50001/Android.mk b/msm8084/loc_api/libloc_api_50001/Android.mk
index e38befa..87b248e 100644
--- a/msm8084/loc_api/libloc_api_50001/Android.mk
+++ b/msm8084/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc.cpp \
diff --git a/msm8909/loc_api/libloc_api_50001/Android.mk b/msm8909/loc_api/libloc_api_50001/Android.mk
index 2353a37..08835d6 100644
--- a/msm8909/loc_api/libloc_api_50001/Android.mk
+++ b/msm8909/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -75,7 +76,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8909/utils/Android.mk b/msm8909/utils/Android.mk
index 289926c..b7e30fb 100644
--- a/msm8909/utils/Android.mk
+++ b/msm8909/utils/Android.mk
@@ -10,7 +10,8 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
- liblog
+ liblog \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
diff --git a/msm8960/core/Android.mk b/msm8960/core/Android.mk
index 3144313..dc2b31a 100644
--- a/msm8960/core/Android.mk
+++ b/msm8960/core/Android.mk
@@ -12,7 +12,8 @@
liblog \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
diff --git a/msm8960/loc_api/libloc_api_50001/Android.mk b/msm8960/loc_api/libloc_api_50001/Android.mk
index b9a63b0..9f60c5d 100644
--- a/msm8960/loc_api/libloc_api_50001/Android.mk
+++ b/msm8960/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc.cpp \
diff --git a/msm8994/core/Android.mk b/msm8994/core/Android.mk
index 46d5343..a8b8995 100644
--- a/msm8994/core/Android.mk
+++ b/msm8994/core/Android.mk
@@ -21,7 +21,8 @@
liblog \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
diff --git a/msm8994/loc_api/libloc_api_50001/Android.mk b/msm8994/loc_api/libloc_api_50001/Android.mk
index 74d5423..4992540 100644
--- a/msm8994/loc_api/libloc_api_50001/Android.mk
+++ b/msm8994/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8996/loc_api/libloc_api_50001/Android.mk b/msm8996/loc_api/libloc_api_50001/Android.mk
index 5182318..c517a23 100644
--- a/msm8996/loc_api/libloc_api_50001/Android.mk
+++ b/msm8996/loc_api/libloc_api_50001/Android.mk
@@ -17,7 +17,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8996/utils/Android.mk b/msm8996/utils/Android.mk
index a322d0f..f347d47 100644
--- a/msm8996/utils/Android.mk
+++ b/msm8996/utils/Android.mk
@@ -10,7 +10,8 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
- liblog
+ liblog \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
diff --git a/msm8998/utils/Android.mk b/msm8998/utils/Android.mk
index ff18f2f..b97dad3 100644
--- a/msm8998/utils/Android.mk
+++ b/msm8998/utils/Android.mk
@@ -12,7 +12,8 @@
libutils \
libcutils \
liblog \
- libloc_pla
+ libloc_pla \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
diff --git a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
index 0d2afe7..c029bc7 100644
--- a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -11,7 +11,8 @@
libutils \
libcutils \
liblog \
- libloc_stub
+ libloc_stub \
+ libprocessgroup
LOCAL_SRC_FILES += \
platform_lib_gettid.cpp \
diff --git a/sdm845/android/Android.mk b/sdm845/android/Android.mk
index 4f1cdf2..ae84c8c 100644
--- a/sdm845/android/Android.mk
+++ b/sdm845/android/Android.mk
@@ -47,6 +47,7 @@
liblocation_api \
LOCAL_CFLAGS += $(GNSS_CFLAGS)
+LOCAL_CFLAGS += -Wno-error
include $(BUILD_SHARED_LIBRARY)
BUILD_GNSS_HIDL_SERVICE := true
diff --git a/sdm845/core/Android.mk b/sdm845/core/Android.mk
index 1a4f51a..46f5fab 100644
--- a/sdm845/core/Android.mk
+++ b/sdm845/core/Android.mk
@@ -35,7 +35,8 @@
LOCAL_CFLAGS += \
-fno-short-enums \
- -D_ANDROID_
+ -D_ANDROID_ \
+ -Wno-error
LOCAL_C_INCLUDES:= \
$(LOCAL_PATH)/data-items \
diff --git a/sdm845/etc/Android.mk b/sdm845/etc/Android.mk
deleted file mode 100644
index d9eb0e1..0000000
--- a/sdm845/etc/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := gps.conf
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/
-LOCAL_SRC_FILES := gps.conf
-
-include $(BUILD_PREBUILT)
-
diff --git a/sdm845/etc/gps.conf b/sdm845/etc/gps.conf
deleted file mode 100644
index 6cd410a..0000000
--- a/sdm845/etc/gps.conf
+++ /dev/null
@@ -1,221 +0,0 @@
-#Uncommenting these urls would only enable
-#the power up auto injection and force injection(test case).
-#XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin
-#XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin
-#XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin
-
-#Version check for XTRA
-#DISABLE = 0
-#AUTO = 1
-#XTRA2 = 2
-#XTRA3 = 3
-XTRA_VERSION_CHECK=0
-
-# Error Estimate
-# _SET = 1
-# _CLEAR = 0
-ERR_ESTIMATE=0
-
-#NTP server
-NTP_SERVER=time.izatcloud.net
-
-#XTRA CA path
-XTRA_CA_PATH=/system/etc/security/cacerts
-
-# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
-# 4 - Debug, 5 - Verbose
-# If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 3
-
-# Intermediate position report, 1=enable, 0=disable
-INTERMEDIATE_POS=0
-
-# Below bit mask configures how GPS functionalities
-# should be locked when user turns off GPS on Settings
-# Set bit 0x1 if MO GPS functionalities are to be locked
-# Set bit 0x2 if NI GPS functionalities are to be locked
-# default both MO and NI locked for maximal privacy
-#GPS_LOCK = 3
-
-# supl version 1.0
-SUPL_VER=0x10000
-
-# Emergency SUPL, 1=enable, 0=disable
-#SUPL_ES=0
-
-#Choose PDN for Emergency SUPL
-#1 - Use emergency PDN
-#0 - Use regular SUPL PDN for Emergency SUPL
-#USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0
-
-#SUPL_MODE is a bit mask set in config.xml per carrier by default.
-#If it is uncommented here, this value will overwrite the value from
-#config.xml.
-#MSA=0X2
-#MSB=0X1
-#SUPL_MODE=
-
-# GPS Capabilities bit mask
-# SCHEDULING = 0x01
-# MSB = 0x02
-# MSA = 0x04
-# ON_DEMAND_TIME = 0x10
-# GEOFENCE = 0x20
-# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
-CAPABILITIES=0x37
-
-# Accuracy threshold for intermediate positions
-# less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
-
-################################
-##### AGPS server settings #####
-################################
-
-# FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234
-
-# FOR C2K PDE SUPPORT, set the following
-# C2K_HOST=c2k.pde.com or IP
-# C2K_PORT=1234
-
-# Bitmask of slots that are available
-# for write/install to, where 1s indicate writable,
-# and the default value is 0 where no slots
-# are writable. For example, AGPS_CERT_WRITABLE_MASK
-# of b1000001010 makes 3 slots available
-# and the remaining 7 slots unwritable.
-#AGPS_CERT_WRITABLE_MASK=0
-
-####################################
-# LTE Positioning Profile Settings
-####################################
-# 0: Enable RRLP on LTE(Default)
-# 1: Enable LPP_User_Plane on LTE
-# 2: Enable LPP_Control_Plane
-# 3: Enable both LPP_User_Plane and LPP_Control_Plane
-LPP_PROFILE = 2
-
-################################
-# EXTRA SETTINGS
-################################
-# NMEA provider (1=Modem Processor, 0=Application Processor)
-NMEA_PROVIDER=0
-# Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE)
-SGLTE_TARGET=0
-
-##################################################
-# Select Positioning Protocol on A-GLONASS system
-##################################################
-# 0x1: RRC CPlane
-# 0x2: RRLP UPlane
-# 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
-
-##################################################
-# Select technology for LPPe Control Plane
-##################################################
-# 0x1: DBH for LPPe CP
-# 0x2: WLAN AP Measurements for LPPe CP
-# 0x4: SRN AP measurement for CP
-# 0x8: Sensor Barometer Measurement LPPe CP
-LPPE_CP_TECHNOLOGY = 0
-
-##################################################
-# Select technology for LPPe User Plane
-##################################################
-# 0x1: DBH for LPPe UP
-# 0x2: WLAN AP Measurements for LPPe UP
-# 0x4: SRN AP measurement for UP
-# 0x8: Sensor Barometer Measurement LPPe UP
-LPPE_UP_TECHNOLOGY = 0
-
-##################################################
-# AGPS_CONFIG_INJECT
-##################################################
-# enable/disable injection of AGPS configurations:
-# SUPL_VER
-# SUPL_HOST
-# SUPL_PORT
-# C2K_HOST
-# C2K_PORT
-# LPP_PROFILE
-# A_GLONASS_POS_PROTOCOL_SELECT
-# 0: disable
-# 1: enable
-AGPS_CONFIG_INJECT = 1
-
-##################################################
-# GNSS settings for automotive use cases
-# Configurations in following section are
-# specific to automotive use cases, others
-# please do not change, keep the default values
-##################################################
-
-# AP Coarse Timestamp Uncertainty
-##################################################
-# default : 10
-# AP time stamp uncertainty, until GNSS receiver
-# is able to acquire better timing information
-AP_TIMESTAMP_UNCERTAINTY = 10
-
-##################################################
-# QDR engine availability status
-##################################################
-# 0 : NO QDR (default)
-# 1 : QDR enabled
-# This settings enables QDR Configuration for
-# automotive use case, if enabled then
-# DR_AP_Service needs to be enabled in izat.conf
-#EXTERNAL_DR_ENABLED = 0
-
-#####################################
-# DR_SYNC Pulse Availability
-#####################################
-# 0 : DR_SYNC pulse not available (default)
-# 1 : DR_SYNC pulse available
-# This configuration enables the driver to make use
-# of PPS events generated by DR_SYNC pulse
-# Standard Linux PPS driver needs to be enabled
-DR_SYNC_ENABLED = 0
-
-#####################################
-# PPS Device name
-#####################################
-PPS_DEVICENAME = /dev/pps0
-
-#####################################
-# AP Clock Accuracy
-#####################################
-# Quality of APPS processor clock (in PPM).
-# Value specified is used for calculation of
-# APPS time stamp uncertainty
-AP_CLOCK_PPM = 100
-
-#####################################
-# MAX ms difference to detect missing pulse
-#####################################
-# Specifies time threshold in ms to validate any missing PPS pulses
-MISSING_PULSE_TIME_DELTA = 900
-
-#####################################
-# Propagation time uncertainty
-#####################################
-# This settings enables time uncertainty propagation
-# logic incase of missing PPS pulse
-PROPAGATION_TIME_UNCERTAINTY = 1
-
-#######################################
-# APN / IP Type Configuration
-# APN and IP Type to use for setting
-# up WWAN call.
-# Use below values for IP Type:
-# v4 = 4
-# v6 = 6
-# v4v6 = 10
-#######################################
-# INTERNET_APN = abc.xyz
-# INTERNET_IP_TYPE = 4
-# SUPL_APN = abc.xyz
-# SUPL_IP_TYPE = 4
diff --git a/sdm845/gnss/GnssAdapter.cpp b/sdm845/gnss/GnssAdapter.cpp
index 9c91dbf..04750b6 100644
--- a/sdm845/gnss/GnssAdapter.cpp
+++ b/sdm845/gnss/GnssAdapter.cpp
@@ -701,10 +701,13 @@
ContextBase::mGps_conf.SUPL_PORT);
mApi.setSensorControlConfig(ContextBase::mSap_conf.SENSOR_USAGE,
ContextBase::mSap_conf.SENSOR_PROVIDER);
+
+ /* Mark these LPPe functions, they are MBN configured.
mApi.setLPPeProtocolCp(
- mAdapter.convertLppeCp(ContextBase::mGps_conf.LPPE_CP_TECHNOLOGY));
+ mAdapter.convertLppeCp(ContextBase::mGps_conf.LPPE_CP_TECHNOLOGY));
mApi.setLPPeProtocolUp(
- mAdapter.convertLppeUp(ContextBase::mGps_conf.LPPE_UP_TECHNOLOGY));
+ mAdapter.convertLppeUp(ContextBase::mGps_conf.LPPE_UP_TECHNOLOGY));
+ */
// set nmea mask type
uint32_t mask = 0;
diff --git a/sdm845/location/Android.mk b/sdm845/location/Android.mk
index bbd6fbd..38dea0a 100644
--- a/sdm845/location/Android.mk
+++ b/sdm845/location/Android.mk
@@ -30,6 +30,7 @@
LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS += $(GNSS_CFLAGS)
+LOCAL_CFLAGS += -Wno-error
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
diff --git a/sdm845/utils/Android.mk b/sdm845/utils/Android.mk
index b8320de..40882a7 100644
--- a/sdm845/utils/Android.mk
+++ b/sdm845/utils/Android.mk
@@ -11,7 +11,8 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
- liblog
+ liblog \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
@@ -30,7 +31,8 @@
# Flag -std=c++11 is not accepted by compiler when LOCAL_CLANG is set to true
LOCAL_CFLAGS += \
-fno-short-enums \
- -D_ANDROID_
+ -D_ANDROID_ \
+ -Wno-error
ifeq ($(TARGET_BUILD_VARIANT),user)
LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER
diff --git a/sdm845/utils/LocTimer.cpp b/sdm845/utils/LocTimer.cpp
index 93775d0..44d6cd5 100644
--- a/sdm845/utils/LocTimer.cpp
+++ b/sdm845/utils/LocTimer.cpp
@@ -398,8 +398,8 @@
inline
LocTimerPollTask::LocTimerPollTask()
- : mFd(epoll_create(2)), mThread(new LocThread()) {
- // before a next call returens, a thread will be created. The run() method
+ : mFd(epoll_create1(EPOLL_CLOEXEC)), mThread(new LocThread()) {
+ // before a next call returns, a thread will be created. The run() method
// could already be running in parallel. Also, since each of the objs
// creates a thread, the container will make sure that there will be only
// one of such obj for our timer implementation.
diff --git a/sdm845/utils/MsgTask.cpp b/sdm845/utils/MsgTask.cpp
index eaead5c..5f73f00 100644
--- a/sdm845/utils/MsgTask.cpp
+++ b/sdm845/utils/MsgTask.cpp
@@ -35,6 +35,7 @@
#include <log_util.h>
#include <loc_log.h>
#include <loc_pla.h>
+#include <processgroup/sched_policy.h>
static void LocMsgDestroy(void* msg) {
delete (LocMsg*)msg;
diff --git a/sdm845/utils/loc_nmea.cpp b/sdm845/utils/loc_nmea.cpp
index 558dc65..bf87599 100644
--- a/sdm845/utils/loc_nmea.cpp
+++ b/sdm845/utils/loc_nmea.cpp
@@ -507,9 +507,9 @@
sv_cache_info.gal_used_mask =
(uint32_t)locationExtended.gnss_sv_used_ids.gal_sv_used_ids_mask;
sv_cache_info.qzss_used_mask =
- (uint32_t)locationExtended.gnss_sv_used_ids.bds_sv_used_ids_mask;
- sv_cache_info.bds_used_mask =
(uint32_t)locationExtended.gnss_sv_used_ids.qzss_sv_used_ids_mask;
+ sv_cache_info.bds_used_mask =
+ (uint32_t)locationExtended.gnss_sv_used_ids.bds_sv_used_ids_mask;
}
if (generate_nmea) {
char talker[3] = {'G', 'P', '\0'};
diff --git a/utils/Android.mk b/utils/Android.mk
index f34e101..9711d7e 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -24,7 +24,8 @@
LOCAL_CFLAGS += \
-fno-short-enums \
- -D_ANDROID_
+ -D_ANDROID_ \
+ -Wno-error
ifeq ($(TARGET_BUILD_VARIANT),user)
LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER