sdm660-common: Checkout GPS config from jasmine V11.0.4.0.QDIMIXM

Change-Id: I27fa3dbb4b1d301a6cd60a6a0b224e35c18c4b46

10 files changed, 281 insertions, 532 deletions

diff --git a/configs/gps/flp.conf b/configs/gps/flp.conf
deleted file mode 100644
index dae3b82..0000000
--- a/configs/gps/flp.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-###################################
-#####       FLP settings      #####
-###################################
-
-###################################
-# FLP BATCHING SIZE
-###################################
-# The number of batched locations
-# requested to modem. The desired number
-# defined below may not be satisfied, as
-# the modem can only return the number
-# of batched locations that can be allocated,
-# which is limited by memory. The default
-# batch size defined as 20 as below.
-BATCH_SIZE=20
-
-# The number of batched locations
-# requested to modem for outdoor
-# trip batching. The desired number
-# defined below may not be satisfied, as
-# the modem can only return the number
-# of batched locations that can be allocated,
-# which is limited by memory. The default
-# trip batch size defined as 600 as below.
-OUTDOOR_TRIP_BATCH_SIZE=600
-
-###################################
-# FLP BATCHING SESSION TIMEOUT
-###################################
-# Duration with which batch session timeout
-# happens in milliseconds. If not specified
-# or set to zero, batching session timeout
-# defaults to 20 seconds by the modem.
-# BATCH_SESSION_TIMEOUT=20000
-
-###################################
-# FLP CAPABILITIES BIT MASK
-###################################
-# GEOFENCE = 0x01
-# BATCHING = 0x02
-# default = GEOFENCE | BATCHING
-CAPABILITIES=0x03
-
-###################################
-# FLP BATCHING ACCURACY
-###################################
-# Set to one of the defined values below
-# to define the accuracy of batching.
-# If not specified, accuracy defaults
-# to LOW.
-# FLP BATCHING ACCURACY values:
-# Low accuracy = 0
-# Medium accuracy = 1
-# High accuracy = 2
-ACCURACY=1
-
-###################################
-# FLP GEOFENCE RESPONSIVENESS
-###################################
-# If set to one of the defined values below,
-# it will override the responsiveness for
-# FLP geofence, which implements the fused
-# location API. If not set to a value defined
-# below, which is default, it will not
-# override the responsivness.
-# FLP_GEOFENCE_RESPONSIVENESS_OVERRIDE Values:
-# 1: LOW responsiveness
-# 2: MEDIUM responsiveness
-# 3: HIGH responsiveness
-FLP_GEOFENCE_RESPONSIVENESS_OVERRIDE = 0
-
-####################################
-# By default APPS must support LB only if modem support
-# LB 1.5 and above. This parameter adds an exception
-# for targets where modem only supports LB 1.0.
-# This might be useful for primarily outdoor devices.
-# 0: MUST NOT ALLOW LB IF MODEM ONLY SUPPORTS
-# LB 1.0
-# 1: ALLOW LB IF MODEM ONLY SUPPORTS LB 1.0
-####################################
-ALLOW_LB_1_0 = 0
-
-####################################
-# By default if network fixes are not sensor assisted
-# these fixes must be dropped. This parameter adds an exception
-# for targets where there is no PDR and we still want to
-# report out network fixes
-# 0: MUST NOT ALLOW NETWORK FIXES
-# 1: ALLOW NETWORK FIXES
-####################################
-ALLOW_NETWORK_FIXES = 0
diff --git a/configs/gps/gps.conf b/configs/gps/gps.conf
deleted file mode 100644
index 54036df..0000000
--- a/configs/gps/gps.conf
+++ /dev/null
@@ -1,212 +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
-
-XTRA_TEST_ENABLED = 1
-XTRA_THROTTLE_ENABLED = 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 = 5
-
-# 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 - non is locked for backward compatibility
-#GPS_LOCK = 0
-
-# supl version 1.0
-SUPL_VER=0x20000
-
-# 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.qxwz.com
-SUPL_PORT=7275
-
-# 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 = 3
-
-################################
-# 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
diff --git a/configs/gps/sap.conf b/configs/gps/sap.conf
deleted file mode 100644
index eb21f01..0000000
--- a/configs/gps/sap.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-################################
-# Sensor Settings
-################################
-#The following parameters are optional.
-#Internal defaults support MEMS sensors
-#native to most handset devices.
-#Device specific sensor characterization
-#for improved performance is possible as
-#described in SAP application notes.
-#GYRO_BIAS_RANDOM_WALK=
-#ACCEL_RANDOM_WALK_SPECTRAL_DENSITY=
-#ANGLE_RANDOM_WALK_SPECTRAL_DENSITY=
-#RATE_RANDOM_WALK_SPECTRAL_DENSITY=
-#VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY=
-
-# Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0)
-# used in loc_eng_reinit
-SENSOR_ACCEL_BATCHES_PER_SEC=2
-SENSOR_ACCEL_SAMPLES_PER_BATCH=5
-SENSOR_GYRO_BATCHES_PER_SEC=2
-SENSOR_GYRO_SAMPLES_PER_BATCH=5
-# Sensor Sampling Rate Parameters for High-Data Rate Filter (should be greater than 0)
-SENSOR_ACCEL_BATCHES_PER_SEC_HIGH=4
-SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH=25
-SENSOR_GYRO_BATCHES_PER_SEC_HIGH=4
-SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25
-
-# Sensor Control Mode (0=AUTO, 1=FORCE_ON)
-# used in loc_eng_reinit
-SENSOR_CONTROL_MODE=0
-
-# Enable or Disable Sensors for GPS use (0=Enable, 1=Disable)
-# used in loc_eng_reinit
-SENSOR_USAGE=0
-
-# Choose GSIFF sensor provider (1=Snapdragon Sensors Core, 2=Android NDK)
-SENSOR_PROVIDER=1
-
-# Bit mask used to define which sensor algorithms are used.
-# Setting each bit has the following definition:
-#  0x1 - DISABLE_INS_POSITIONING_FILTER
-#  0x0 - ENABLE_INS_POSITIONING_FILTER
-SENSOR_ALGORITHM_CONFIG_MASK=0x1
-
-#Vehicle Network Provider configuration
-
-#Service configuration strings
-#The number before colon in VN_X items defines version of the format of the rest of the string
-#VN_ACCEL_CFG=0:5
-#VN_GYRO_CFG=0:5.5
-#VN_ODOMETRY_CFG=0:2,4.5
-VN_ACCEL_CFG=1:128,0,12,0.0048828125,12,12,0.0048828125,24,12,0.0048828125
-VN_GYRO_CFG=1:129,0,16,0.00006103515625,16,16,0.00006103515625,32,16,0.00006103515625
-VN_ODOMETRY_CFG=1:130,0,1,5,6,32
-VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2
-VN_DWS_CFG=1:132,5,8,1,2,3,1,1,5,2,7,2,9,2,11,2,13,2,15,2,17,2,19,2
-VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8
-
-#Procesors clock ratio: AP and CAN bus microcontroller
-VN_PROC_CLOCK_RATIO=1.93165618815148
-
-# Time source used by Sensor HAL
-# Setting this value controls accuracy of location sensor services.
-#  0 - Unknown
-#  1 - CLOCK_BOOTTIME
-#  2 - CLOCK_MONOTONIC
-#  3 - CLOCK_REALTIME
-#  4 - CLOCK_BOOTTIME using Alarm timer interface
-NDK_PROVIDER_TIME_SOURCE=1
-
diff --git a/gps/etc/Android.mk b/gps/etc/Android.mk
deleted file mode 100644
index 22ca2f7..0000000
--- a/gps/etc/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := gps.conf
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := gps.conf
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := flp.conf
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := flp.conf
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)
-include $(BUILD_PREBUILT)
-
diff --git a/gps/etc/gps.conf b/gps/etc/gps.conf
index 3914757..9e975b6 100644
--- a/gps/etc/gps.conf
+++ b/gps/etc/gps.conf
@@ -1,3 +1,9 @@
+#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
@@ -5,6 +11,11 @@
 #XTRA3   = 3
 XTRA_VERSION_CHECK=0
 
+XTRA_TEST_ENABLED = 1
+XTRA_THROTTLE_ENABLED = 0
+
+
+
 # Error Estimate
 # _SET = 1
 # _CLEAR = 0
@@ -14,57 +25,61 @@ ERR_ESTIMATE=0
 NTP_SERVER=time.izatcloud.net
 
 #XTRA CA path
-XTRA_CA_PATH=/usr/lib/ssl/certs
+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
+DEBUG_LEVEL = 5
 
 # 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 - non is locked for backward compatibility
+GPS_LOCK = 0
+
 # supl version 1.0
-SUPL_VER=0x10000
+SUPL_VER=0x20000
 
 # Emergency SUPL, 1=enable, 0=disable
-#SUPL_ES=1
+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
+USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1
 
 #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=
+SUPL_MODE=3
 
 # GPS Capabilities bit mask
 # SCHEDULING = 0x01
 # MSB = 0x02
 # MSA = 0x04
 # ON_DEMAND_TIME = 0x10
-# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING
-CAPABILITIES=0x17
+# GEOFENCE = 0x20
+# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
+CAPABILITIES=0x13
 
 # Accuracy threshold for intermediate positions
 # less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
+ACCURACY_THRES=70
 
 ################################
 ##### AGPS server settings #####
 ################################
 
 # FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234
-
-# FOR MO SUPL SUPPORT, set the following
-# MO_SUPL_HOST=supl.host.com or IP
-# MO_SUPL_PORT=1234
+SUPL_HOST=supl.google.com
+SUPL_PORT=7275
 
 # FOR C2K PDE SUPPORT, set the following
 # C2K_HOST=c2k.pde.com or IP
@@ -87,13 +102,6 @@ CAPABILITIES=0x17
 # 3: Enable both LPP_User_Plane and LPP_Control_Plane
 LPP_PROFILE = 2
 
-####################################
-#Datum Type
-####################################
-# 0: WGS-84
-# 1: PZ-90
-DATUM_TYPE = 0
-
 ################################
 # EXTRA SETTINGS
 ################################
@@ -108,7 +116,7 @@ SGLTE_TARGET=0
 # 0x1: RRC CPlane
 # 0x2: RRLP UPlane
 # 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
+A_GLONASS_POS_PROTOCOL_SELECT = 0x2
 
 ##################################################
 # Select technology for LPPe Control Plane
@@ -135,8 +143,6 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0
 #     SUPL_VER
 #     SUPL_HOST
 #     SUPL_PORT
-#     MO_SUPL_HOST
-#     MO_SUPL_PORT
 #     C2K_HOST
 #     C2K_PORT
 #     LPP_PROFILE
@@ -185,16 +191,6 @@ DR_SYNC_ENABLED = 0
 PPS_DEVICENAME = /dev/pps0
 
 #####################################
-# Ignore PPS at Startup and after long outage
-#####################################
-IGNORE_PPS_PULSE_COUNT = 1
-
-#####################################
-# Long GNSS RF outage in seconds
-#####################################
-GNSS_OUTAGE_DURATION = 10
-
-#####################################
 # AP Clock Accuracy
 #####################################
 # Quality of APPS processor clock (in PPM).
diff --git a/configs/gps/izat.conf b/gps/etc/izat.conf
index 79d779c..678228c 100644
--- a/configs/gps/izat.conf
+++ b/gps/etc/izat.conf
@@ -2,7 +2,7 @@
 # Log verbosity control for izat modules
 #########################################
 # OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5
-IZAT_DEBUG_LEVEL = 5
+IZAT_DEBUG_LEVEL = 2
 
 ##################################################
 # Select WIFI Wait Timeout value in seconds for SUPL
@@ -16,6 +16,13 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 ##################################################
 LPPE_SRN_DATA_SCAN_INJECT_TIME=2
 
+##################################################
+# Identify this target as OTA updated or new
+# 0 - New target
+# 1 - OTA updated
+##################################################
+OTA_UPDATED_TARGET=0
+
 ################################
 # NLP Settings
 ################################
@@ -37,7 +44,7 @@ LPPE_SRN_DATA_SCAN_INJECT_TIME=2
 # without EULA consent, but the uncertainty can be high.
 # QNP preferred mode prefers QNP when there is EULA consent,
 # otherwise OSNLP is used.
-NLP_MODE = 1
+NLP_MODE = 4
 NLP_MODE_EMERGENCY = 2
 NLP_TOLERANCE_TIME_FIRST = 5000
 NLP_TOLERANCE_TIME_AFTER = 20000
@@ -46,22 +53,14 @@ NLP_ACCURACY_MULTIPLE = 2
 NLP_COMBO_MODE_USES_QNP_WITH_NO_EULA_CONSENT = 1
 
 #########################################
-# NLP PACKAGE AND ACTION SETTINGS
+# NLP PACKAGE SETTINGS
 #########################################
-# OSNLP_PACKAGE/OSNLP_ACTION: name/action of default NLP package
-#OSNLP_PACKAGE = com.google.android.gms
-#OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider
-# REGION_OSNLP_PACKAGE/REGION_OSNLP_ACTION:
-# These two values will be used as alternative
+# OSNLP_PACKAGE: name of default NLP package
+OSNLP_PACKAGE = com.google.android.gms
+# REGION_OSNLP_PACKAGE:
+# This value will be used as alternative
 # for particular region where default NLP is not functional.
-#REGION_OSNLP_PACKAGE = com.baidu.map.location
-#REGION_OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider
-
-# Threshold period for ZPP triggers
-ZPP_TRIGGER_THRESHOLD=60000
-# Accuracy threshold for ZPP positions
-# less accurate positions are ignored
-ZPP_ACCURACY_THRESHOLD=20000
+#REGION_OSNLP_PACKAGE =
 
 ###################################
 # GEOFENCE SERVICES
@@ -97,20 +96,11 @@ GTP_PRIVACY_RETRY_INTERVAL = 86400
 #BASIC
 #PREMIUM
 
-#GTP_CELL_PROC valid options:
-# AP
-# MODEM
-GTP_CELL_PROC=MODEM
-
-#GTP_CELL valid modes:
-# DISABLED
-# BASIC
-GTP_CELL=DISABLED
-
-#GTP_WIFI valid modes:
+#GTP_MODE valid modes:
 # DISABLED
-# BASIC
-GTP_WIFI=DISABLED
+# LEGACY_WWAN
+# SDK (WWAN not available for Modems before LocTech 10.0)
+GTP_MODE=DISABLED
 
 #GTP_WAA valid modes:
 # DISABLED
@@ -121,13 +111,9 @@ GTP_WAA=DISABLED
 # DISABLED
 # BASIC
 # PREMIUM
+# MODEM_DEFAULT
 SAP=PREMIUM
 
-#ODCPI valid modes:
-#DISABLED
-#BASIC
-ODCPI=BASIC
-
 #FREE_WIFI_SCAN_INJECT valid modes:
 #DISABLED
 #BASIC
@@ -160,9 +146,8 @@ WIFI_SUPPLICANT_INFO=BASIC
 
 #FEATURE MASKS:
 # GTP-WIFI    0X03
-# GTP-AP-CELL 0X0c
 # GTP-MP-CELL 0xc00
-# GTP-WAA     0X300
+# GTP-WAA     0x100
 # SAP         0Xc0
 # ODCPI      0x1000
 # FREE_WIFI_SCAN_INJECT   0x2000
@@ -178,85 +163,49 @@ WIFI_SUPPLICANT_INFO=BASIC
 #1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
 #2. 'all' or 'all exclude' -> for all basebands
 #3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte
-PROCESS_NAME=DR_AP_Service
-PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps diag
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=all
-BASEBAND=all
-LEAN_TARGETS=DISABLED
-HARDWARE_TYPE=automotive
-
-#Valyes for LEAN_TARGETS can be:
-#ENABLED  -> if this process is supposed to run on lean and mean targets
-#DISABLED -> if this process is to be disabled on lean and mean targets
-PROCESS_NAME=garden_app
-PROCESS_ARGUMENT=-l 0 -T 1
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps diag
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=all
-BASEBAND=all
-LEAN_TARGETS=DISABLED
-HARDWARE_TYPE=automotive
-
-PROCESS_NAME=gpsone_daemon
-PROCESS_ARGUMENT=
-PROCESS_STATE=ENABLED
-PROCESS_GROUPS=inet
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=msm7630_fusion
-BASEBAND=svlte2a sglte sglte2
-LEAN_TARGETS=DISABLED
-HARDWARE_TYPE=all
-
 PROCESS_NAME=lowi-server
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_admin wifi inet qcom_diag
+PROCESS_GROUPS=gps wifi inet oem_2901
 PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0xf303
 PLATFORMS=all
 BASEBAND=all
-LEAN_TARGETS=DISABLED
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=0
 
 PROCESS_NAME=xtwifi-inet-agent
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
 PROCESS_GROUPS=inet gps
 PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xf0f
+IZAT_FEATURE_MASK=0xc03
 PLATFORMS=all
 BASEBAND=all
-LEAN_TARGETS=DISABLED
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=xtwifi-client
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=wifi inet gps system oem_2952
+PROCESS_GROUPS=wifi inet gps system oem_2904
 PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xf0f
+IZAT_FEATURE_MASK=0xd03
 PLATFORMS=all
 BASEBAND=all
-LEAN_TARGETS=DISABLED
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=slim_daemon
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps qcom_diag can
+PROCESS_STATE=ENABLED
+PROCESS_GROUPS=gps oem_2901 can plugdev diag sensors
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0
 PLATFORMS=all
 BASEBAND=all
-LEAN_TARGETS=DISABLED
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=xtra-daemon
 PROCESS_ARGUMENT=
@@ -266,14 +215,40 @@ PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0
 PLATFORMS=all
 BASEBAND=all
-LEAN_TARGETS=DISABLED
 HARDWARE_TYPE=all
-
-##################################################
-# The name of process which launches XTRA client.
-# Default process name in software which launches
-# XTRA client is system-server. Uncomment the below
-# to set the desired process which will start the
-# XTRA client.
-##################################################
-# XC20_LAUNCH_PROCESS_NAME=garden_app
+VENDOR_ENHANCED_PROCESS=0
+
+########################################
+# Engine Service which host DRE module #
+# To enable DRE engine service, change #
+# PROCESS_STATE=ENABLED                #
+########################################
+PROCESS_NAME=engine-service
+PROCESS_ARGUMENT=DRE-INT libloc_epDr.so
+PROCESS_STATE=DISABLED
+PROCESS_GROUPS=gps diag inet qwes oem_2901 system
+PREMIUM_FEATURE=0
+IZAT_FEATURE_MASK=0
+PLATFORMS=all
+BASEBAND=all
+HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1
+
+########################################
+# Engine Service which host PPE module #
+# To enable PPE engine service, change #
+# PROCESS_STATE=ENABLED                #
+# and update process arugements        #
+# with PPE library name                #
+#PROCESS_ARGUMENT=PPE libepsimulator.so#
+########################################
+PROCESS_NAME=engine-service
+PROCESS_ARGUMENT=PPE libepsimulator.so
+PROCESS_STATE=DISABLED
+PROCESS_GROUPS=gps diag inet oem_2901
+PREMIUM_FEATURE=0
+IZAT_FEATURE_MASK=0
+PLATFORMS=all
+BASEBAND=all
+HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1
diff --git a/configs/gps/lowi.conf b/gps/etc/lowi.conf
index 5fdca39..5006b59 100644
--- a/configs/gps/lowi.conf
+++ b/gps/etc/lowi.conf
@@ -5,7 +5,11 @@
 # GENERAL DESCRIPTION
 #  This file contains the config params for LOWI
 #
-# Copyright (c) 2012-2013 Qualcomm Atheros, Inc.
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+#  All Rights Reserved.
+#  Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+# 2012-2013 Qualcomm Atheros, Inc.
 #  All Rights Reserved.
 #  Qualcomm Atheros Confidential and Proprietary.
 #
@@ -19,3 +23,5 @@
 # Log level
 # EL_LOG_OFF = 0, EL_ERROR = 1, EL_WARNING = 2, EL_INFO = 3, EL_DEBUG = 4, EL_VERBOSE = 5, EL_LOG_ALL = 100
 LOWI_LOG_LEVEL = 3
+LOWI_USE_LOWI_LP = 0
+
diff --git a/gps/etc/sap.conf b/gps/etc/sap.conf
new file mode 100644
index 0000000..98fddba
--- /dev/null
+++ b/gps/etc/sap.conf
@@ -0,0 +1,163 @@
+################################
+# Sensor Settings
+################################
+#The following parameters are optional.
+#Internal defaults support MEMS sensors
+#native to most handset devices.
+#Device specific sensor characterization
+#for improved performance is possible as
+#described in SAP application notes.
+#GYRO_BIAS_RANDOM_WALK=
+#ACCEL_RANDOM_WALK_SPECTRAL_DENSITY=
+#ANGLE_RANDOM_WALK_SPECTRAL_DENSITY=
+#RATE_RANDOM_WALK_SPECTRAL_DENSITY=
+#VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY=
+
+# Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0)
+# used in loc_eng_reinit
+SENSOR_ACCEL_BATCHES_PER_SEC=2
+SENSOR_ACCEL_SAMPLES_PER_BATCH=5
+SENSOR_GYRO_BATCHES_PER_SEC=2
+SENSOR_GYRO_SAMPLES_PER_BATCH=5
+# Sensor Sampling Rate Parameters for High-Data Rate Filter (should be greater than 0)
+SENSOR_ACCEL_BATCHES_PER_SEC_HIGH=4
+SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH=25
+SENSOR_GYRO_BATCHES_PER_SEC_HIGH=4
+SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25
+
+# Sensor Control Mode (0=AUTO, 1=FORCE_ON, 2=MODEM_DEFAULT)
+# used in loc_eng_reinit
+SENSOR_CONTROL_MODE=1
+SENSOR_USAGE=0
+SENSOR_PROVIDER=1
+
+# Bit mask used to define which sensor algorithms are used.
+# Setting each bit has the following definition:
+#  0x1 - DISABLE_INS_POSITIONING_FILTER
+#  0x0 - ENABLE_INS_POSITIONING_FILTER
+SENSOR_ALGORITHM_CONFIG_MASK=0x0
+
+#Vehicle Network Provider configuration
+
+#Service configuration strings
+#The number before colon in VN_X items defines version of the format of the rest of the string
+#VN_ACCEL_CFG=0:5
+#VN_GYRO_CFG=0:5.5
+#VN_ODOMETRY_CFG=0:2,4.5
+
+################################################
+#  QDR3 configurations                         #
+################################################
+VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2
+VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8
+
+################################################
+#  QDR2-Gyro configurations                    #
+################################################
+#VN_GYRO_CFG=1:555,0,1,0,0,0,0,-6.5,6.6066,-6.5,-1.00,2,6.607,6.6068,0,0,16,0.0002,0,16,0.0002,0,16,0.0002
+#VN_SPEED_CFG=1:555,0,0,1,2,1,0.01,0,56,8,48,8
+#VN_GEAR_CFG=1:555,16,4,0,1,1,9,0,1,2,3,4,5,6,7,8
+
+################################################
+#  QDR2-DWT configurations                     #
+################################################
+#VN_SPEED_CFG=1:555,22,1,2,1,1,1,0,8,8,23,1,2,0,1,0,8,8,23,1
+#VN_GEAR_CFG=1:555,12,4,16,14,16,8,1,2,3,4,5,6,7,8
+#VN_DWS_CFG=1:555,0,0,1,3,1,1,0,0,8,0,0,8,8,0,0,16,8,0,0,24,8,0,0
+#VN_GYRO_CFG=1:555,40,16,1.0,40,16,1.0,40,16,1.0
+
+#####################################################################################
+#                    VNW service batching configuration strings                     #
+# VNW provider will initialize default type as Time based batching                  #
+# Each service batch value is configured to be 100                                  #
+# VN_ACCEL_CFG_BATCH_VALUE will be treated as time in Ms if VN_CFG_BATCH_TYPE       #
+# is set to time based batching                                                     #
+# VN_ACCEL_CFG_BATCH_VALUE will be treated as sample count if VN_CFG_BATCH_TYPE     #
+# is set to count based batching                                                    #
+# Uncomment and update batch time /sample count as per selected batching type       #
+#####################################################################################
+# Batching type
+# 1 - Time based  (default)
+# 2 - Count based
+#VN_CFG_BATCH_TYPE=1
+
+#Vehicle Accel batching value, it can either accept time in milli seconds or sample count
+#VN_ACCEL_CFG_BATCH_VALUE=100
+
+#Vehicle Gyro batching value, it can either accept time in milli seconds or sample count
+#VN_GYRO_CFG_BATCH_VALUE=100
+
+#Vehicle Odo batching value, it can either accept time in milli seconds or sample count
+#VN_ODOMETRY_CFG_BATCH_VALUE=100
+
+#Vehicle Speed batching value, it can either accept time in milli seconds or sample count
+#VN_SPEED_CFG_BATCH_VALUE=100
+
+#Vehicle Gear batching value, it can either accept time in milli seconds or sample count
+#VN_GEAR_CFG_BATCH_VALUE=100
+
+#Vehicle DWS batching value, it can either accept time in milli seconds or sample count
+#VN_DWS_CFG_BATCH_VALUE=100
+####################################################################################
+
+#Procesors clock ratio: AP and CAN bus microcontroller
+################################################
+#  QDR3 configurations                         #
+################################################
+VN_PROC_CLOCK_RATIO=1.0
+
+################################################
+#  QDR2-DWT OR QDR2-Gyro configurations        #
+################################################
+#VN_PROC_CLOCK_RATIO = 1.0
+
+# Time source used by Sensor HAL
+# Setting this value controls accuracy of location sensor services.
+#  0 - Unknown
+#  1 - CLOCK_BOOTTIME
+#  2 - CLOCK_MONOTONIC
+#  3 - CLOCK_REALTIME
+#  4 - CLOCK_BOOTTIME using Alarm timer interface
+NDK_PROVIDER_TIME_SOURCE=1
+
+# Sensor Batching Configuration
+# 0 - Time based
+# 1 - Fixed count based
+# 2 - Variable count based
+COUNT_BASED_BATCHING=1
+SYNC_ONCE=0
+
+#Sensor HAL Provider Configuration HAL Library name including path
+################################################
+#                                              #
+# Configuration for BMI 160 Sensor             #
+#                                              #
+################################################
+SENSOR_TYPE=2
+SENSOR_HAL_LIB_PATH=/usr/lib/libbmi160sensors.so.1
+
+################################################
+#                                              #
+# Configuration for ASM330 Sensor              #
+#                                              #
+################################################
+#SENSOR_TYPE=1
+#SENSOR_HAL_LIB_PATH=/usr/lib/libasm330sensors.so.1
+
+
+################################################
+#                                              #
+# Configuration for IAM20680 Sensor            #
+#                                              #
+################################################
+#SENSOR_TYPE=3
+#SENSOR_HAL_LIB_PATH=/usr/lib/libiam20680sensors.so.1
+
+
+################################################
+#                                              #
+# Configuration for SMI130 Sensor              #
+#                                              #
+################################################
+#SENSOR_TYPE=4
+#SENSOR_HAL_LIB_PATH=/usr/lib/libsmi130sensors.so.1
diff --git a/configs/gps/xtwifi.conf b/gps/etc/xtwifi.conf
index 583dd3f..5d7df9e 100644
--- a/configs/gps/xtwifi.conf
+++ b/gps/etc/xtwifi.conf
@@ -40,10 +40,13 @@ SIZE_BYTE_TOTAL_CACHE = 5000000
 # can support ASN URI v3 protocol.
 # XT_SERVER_ROOT_URL_V3 = https://gtpma1.izatcloud.net:443/uds/v3
 
-# 1: default mode, where mobile downloads tiles and partitions
-# 2: mode for memory and bandwidth limited devices, where mobile
-#    downloads AP list and cell list
-# GTP_AP_MODE = 2
+# 3: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed
+#    for any GTP requests, instead notification is sent to Izat SDK.
+#    WiFi crowdsourcing module is disabled.
+# 4: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed
+#    for any GTP requests, instead notification is sent to Izat SDK.
+#    WiFi crowdsourcing module is active, also accessed via Izat SDK.
+# GTP_AP_MODE = 4
 
 # 1: MP cell features relies on GTP AP for either download or upload
 # 0: MP cell features does not rely on GTP AP
diff --git a/sdm660.mk b/sdm660.mk
index 6c7c17b..527667a 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -241,12 +241,12 @@ PRODUCT_PACKAGES += \
     libsensorndkbridge
 
 PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
-    $(COMMON_PATH)/configs/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
-    $(COMMON_PATH)/configs/gps/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
-    $(COMMON_PATH)/configs/gps/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
-    $(COMMON_PATH)/configs/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
-    $(COMMON_PATH)/configs/gps/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf
+    $(COMMON_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
+    $(COMMON_PATH)/gps/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \
+    $(COMMON_PATH)/gps/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
+    $(COMMON_PATH)/gps/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
+    $(COMMON_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
+    $(COMMON_PATH)/gps/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf
 
 # Healthd
 PRODUCT_PACKAGES += \