msm8996: Update GPS configs for oreo

Change-Id: Iff0084580c3a496b7b2d73f3778a54b89cbcad2c
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

6 files changed, 303 insertions, 107 deletions

diff --git a/gps/etc/flp.conf b/gps/etc/flp.conf
index 7d6002f..dae3b82 100644
--- a/gps/etc/flp.conf
+++ b/gps/etc/flp.conf
@@ -14,6 +14,16 @@
 # 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
 ###################################
@@ -42,7 +52,7 @@ CAPABILITIES=0x03
 # Low accuracy = 0
 # Medium accuracy = 1
 # High accuracy = 2
-ACCURACY=0
+ACCURACY=1
 
 ###################################
 # FLP GEOFENCE RESPONSIVENESS
@@ -58,3 +68,24 @@ ACCURACY=0
 # 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/gps/etc/gps.conf b/gps/etc/gps.conf
index 2a8eb8c..dfe91c1 100644
--- a/gps/etc/gps.conf
+++ b/gps/etc/gps.conf
@@ -1,8 +1,21 @@
 #Uncommenting these urls would only enable
 #the power up auto injection and force injection(test case).
-XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra3grc.bin
-XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra3grc.bin
-XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra3grc.bin
+#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
+
+#ifdef VENDOR_EDIT 
+# zuoyonghua@oneplus.cn add gps xtra server for speed up gps cold start 
+XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra3grc.bin 
+XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra3grc.bin 
+XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra3grc.bin 
+#endif
+
+#ifdef VENDOR_EDIT 
+# songhao@oneplus.cn,XTRA download config for debug
+XTRA_TEST_ENABLED = 1
+XTRA_THROTTLE_ENABLED = 0 
+#endif
 
 #Version check for XTRA
 #DISABLE = 0
@@ -16,8 +29,8 @@ XTRA_VERSION_CHECK=0
 # _CLEAR = 0
 ERR_ESTIMATE=0
 
-#Test
-NTP_SERVER=time.gpsonextra.net
+#NTP server
+NTP_SERVER=time.izatcloud.net
 #Asia
 # NTP_SERVER=asia.pool.ntp.org
 #Europe
@@ -44,12 +57,12 @@ INTERMEDIATE_POS=0
 SUPL_VER=0x10000
 
 # Emergency SUPL, 1=enable, 0=disable
-SUPL_ES=0
+#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=1
+#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
@@ -65,11 +78,11 @@ USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1
 # ON_DEMAND_TIME = 0x10
 # GEOFENCE = 0x20
 # default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
-CAPABILITIES=0x37
+CAPABILITIES=0x31
 
 # Accuracy threshold for intermediate positions
 # less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
+ACCURACY_THRES=100
 
 ################################
 ##### AGPS server settings #####
@@ -98,7 +111,7 @@ CAPABILITIES=0x37
 # 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
+LPP_PROFILE = 0
 
 ################################
 # EXTRA SETTINGS
@@ -116,6 +129,99 @@ SGLTE_TARGET=0
 # 0x4: LLP Uplane
 #ifndef zuoyonghua@oneplus.cn enable all bit mask for GLONASS
 #A_GLONASS_POS_PROTOCOL_SELECT = 0
-#else
+#else 
 A_GLONASS_POS_PROTOCOL_SELECT = 15
 #endif
+
+##################################################
+# 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/gps/etc/izat.conf b/gps/etc/izat.conf
index d9fc913..d300033 100644
--- a/gps/etc/izat.conf
+++ b/gps/etc/izat.conf
@@ -9,10 +9,18 @@ IZAT_DEBUG_LEVEL = 2
 ##################################################
 WIFI_WAIT_TIMEOUT_SELECT = 0
 
+##################################################
+# Time interval of injecting SRN scan data to modem
+# time in seconds.
+# Note: recommended value is between 1-5 sec
+##################################################
+LPPE_SRN_DATA_SCAN_INJECT_TIME=2
+
 ################################
 # NLP Settings
 ################################
-# NLP_MODE  1: GNP Only, 2: QNP Only, 3: Combo
+# NLP_MODE  1: OSNLP Only, 2: QNP Only, 3: Combo, 4: QNP preferred
+# For Automotive products, please use NLP_MODE = 4 only.
 # NLP_TOLERANCE_TIME_FIRST: Time in ms used in Combo mode
 # to determine how much Tolerance for first position
 # NLP_TOLERANCE_TIME_AFTER: Time in ms used in Combo mode
@@ -27,13 +35,28 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 # QNP when the EULA is not consented to by the user. QNP can
 # still return ZPP locations or injected locations even
 # 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_EMERGENCY = 2
 NLP_TOLERANCE_TIME_FIRST = 5000
 NLP_TOLERANCE_TIME_AFTER = 20000
 NLP_THRESHOLD = 3
 NLP_ACCURACY_MULTIPLE = 2
 NLP_COMBO_MODE_USES_QNP_WITH_NO_EULA_CONSENT = 1
 
+#########################################
+# NLP PACKAGE AND ACTION SETTINGS
+#########################################
+# OSNLP_PACKAGE/OSNLP_ACTION: name/action of default NLP package
+OSNLP_PACKAGE = com.amap.android.ams
+OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider
+# REGION_OSNLP_PACKAGE/REGION_OSNLP_ACTION:
+# These two values 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
 
@@ -52,6 +75,18 @@ ZPP_TRIGGER_THRESHOLD=60000
 GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE = 0
 
 #####################################
+#GTP Opt-In app
+#####################################
+
+#GTP privacy policy version url
+#https support is required
+GTP_PRIVACY_VERSION_URL = https://info.izatcloud.net/privacy/version.html
+
+#GTP privacy policy version download retry interval
+#unit is second. default is 86400
+GTP_PRIVACY_RETRY_INTERVAL = 86400
+
+#####################################
 # IZAT PREMIUM FEATURE SETTINGS
 #####################################
 #Possible states of a feature:
@@ -109,10 +144,17 @@ WIFI_SUPPLICANT_INFO=BASIC
 # Location process launcher settings
 #####################################
 
+# DO NOT MODIFY
+# Modifying below attributes without
+# caution can have serious implications.
+
 #Values for PROCESS_STATE:
 # ENABLED
 # DISABLED
 
+#PROCESS_NAME
+# Name of the executable file.
+
 #FEATURE MASKS:
 # GTP-WIFI    0X03
 # GTP-AP-CELL 0X0c
@@ -133,41 +175,54 @@ 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=/system/bin/garden_app
-PROCESS_ARGUMENT=-u 0 -q 0 -j 0 -g 0 -l 0 -Z 0 -T 1
+PROCESS_NAME=garden_app
+PROCESS_ARGUMENT=-l 0 -T 1
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_raw
+PROCESS_GROUPS=gps diag
 PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0
 PLATFORMS=all
-BASEBAND=auto
+BASEBAND=all
 LEAN_TARGETS=DISABLED
+HARDWARE_TYPE=automotive
 
-PROCESS_NAME=/system/bin/gpsone_daemon
+PROCESS_NAME=gpsone_daemon
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=inet net_raw
+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=/system/bin/lowi-server
+PROCESS_NAME=lowi-server
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_admin wifi inet qcom_diag net_raw
+PROCESS_GROUPS=gps net_admin wifi inet oem_2901
 PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0xf303
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
+HARDWARE_TYPE=all
 
-PROCESS_NAME=/system/bin/xtwifi-inet-agent
+PROCESS_NAME=xtwifi-inet-agent
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
 PROCESS_GROUPS=inet gps
@@ -176,23 +231,46 @@ IZAT_FEATURE_MASK=0xc0f
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
+HARDWARE_TYPE=all
 
-PROCESS_NAME=/system/bin/xtwifi-client
+PROCESS_NAME=xtwifi-client
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=net_admin wifi inet gps net_raw rfs_shared
+PROCESS_GROUPS=wifi inet gps rfs_shared system
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0f
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
+HARDWARE_TYPE=all
 
-PROCESS_NAME=/system/vendor/bin/slim_daemon
+PROCESS_NAME=slim_daemon
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_raw qcom_diag
+PROCESS_GROUPS=gps oem_2901 can
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
+HARDWARE_TYPE=all
+
+PROCESS_NAME=xtra-daemon
+PROCESS_ARGUMENT=
+PROCESS_STATE=ENABLED
+PROCESS_GROUPS=inet gps system
+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
diff --git a/gps/etc/lowi.conf b/gps/etc/lowi.conf
index cfadcb2..5fdca39 100644
--- a/gps/etc/lowi.conf
+++ b/gps/etc/lowi.conf
@@ -16,36 +16,6 @@
 # X86 ONLY - UBUNTU:
 # Copy this file in the same directory where the executable is
 
-# The RSSI threshold used in the RTT outlier detection in half decibels. Default value recommended by the
-# system team currently is -140 (corresponding to -70 dB).
-LOWI_RSSI_THRESHOLD_FOR_RTT = -140
-
-# Number of measurment per AP for RTS/CTS
-LOWI_RTS_CTS_NUM_MEAS = 5
-
-# Maximum Number of Outstanding Requests supported
-LOWI_MAX_OUTSTANDING_REQUEST = 255
-
-# Maximum number of records in Cache
-LOWI_MAX_NUM_CACHE_RECORDS = 200
-
-# Default threshold before issuing another fresh scan (ms)
-LOWI_FRESH_SCAN_THRESHOLD = 500
-
-# Timeout in case no result is reported by the driver (seconds)
-LOWI_NO_RESULT_WAIT_TOLERANCE = 10
-
-# Use Fake Wifi driver. Only valid for engineering builds
-LOWI_USE_FAKE_WIFI_DRIVER = 0
-
-# Use ROME Wifi driver. Only valid for engineering builds
-# Will be removed later only for development support
-LOWI_USE_ROME_WIFI_DRIVER = 0
-
-# Use LOWI LP.
-# When enabled the Discovery Request will be routed to LOWI-LP
-LOWI_USE_LOWI_LP = 1
-
 # 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 = 2
+LOWI_LOG_LEVEL = 3
diff --git a/gps/etc/sap.conf b/gps/etc/sap.conf
index 3e5b508..22561f4 100644
--- a/gps/etc/sap.conf
+++ b/gps/etc/sap.conf
@@ -42,6 +42,24 @@ SENSOR_PROVIDER=1
 #  0x0 - ENABLE_INS_POSITIONING_FILTER
 SENSOR_ALGORITHM_CONFIG_MASK=0x00
 
+
+#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
diff --git a/gps/etc/xtwifi.conf b/gps/etc/xtwifi.conf
index fc17faa..583dd3f 100644
--- a/gps/etc/xtwifi.conf
+++ b/gps/etc/xtwifi.conf
@@ -6,77 +6,70 @@
 #Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
 #All Rights Reserved.
 #Qualcomm Atheros Confidential and Proprietary.
-
-# Log verbosity control for most of the GTP WiFi system, including native and
-# Java componenets
-# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5, ALL = 100
-DEBUG_GLOBAL_LOG_LEVEL = 2
-
-# this is used at the server side to distinguish uploads from different maker/model
-# default "Qualcomm"
-OEM_ID_IN_REQUEST_TO_SERVER = "Qualcomm"
-
-# this is used at the server side to distinguish uploads from different maker/model
-# default "UNKNOWN"
-MODEL_ID_IN_REQUEST_TO_SERVER = "UNKNOWN"
+#
+#Copyright (c) 2017 Qualcomm Technologies, Inc.
+#All Rights Reserved.
+#Confidential and Proprietary - Qualcomm Technologies, Inc.
 
 ##############################################################################
-# GTP-WiFi positioning config                                                #
+# non-IOT devices configuration items                                        #
+# For non-IOT devices, configure below configuration items                   #
+# according to the app note: 80-NK218-1 and remove the configuration items   #
+# in section of "IOT devices configuration items".                           #
 ##############################################################################
 
-# URL for the server position request
-XT_SERVER_ROOT_URL = https://gtpa1.izatcloud.net:443/uds/v2
+# ASN URI v2 to be used by some GTP AP modules that
+# need to run with ASN URI v2 protocol.
+XT_SERVER_ROOT_URL = https://gtp1.izatcloud.net:443/uds/v2
+
+# ASN URI v3 to be used by GTP AP modules that
+# can support ASN URI v3 protocol.
+XT_SERVER_ROOT_URL_V3 = https://gtp1.izatcloud.net:443/uds/v3
 
 # size, in bytes, of the cache on device
 SIZE_BYTE_TOTAL_CACHE = 5000000
 
-# value 0: (default) use the async LOWI wifi scanner
-# value 10: FAKE AP wifi scanner
-WIFI_SCANNER_CHOICE = 0
-
 ##############################################################################
-# XT-WiFi crowd sourcing config                                              #
+# IOT devices configuration items                                            #
+# For IOT devices, configure below configuration items                       #
+# according to the app note and remove the configuration items in section of #
+# "non-IOT devices configuration items".                                     #
 ##############################################################################
-# Use server suggestion for crowd sourcing configuration
-ENABLE_SERVER_SUGGESTION_FOR_CROWD_SOURCING = 1
 
-# Maximum number of APs to be collected for upload
-NUM_MAX_AP_PER_UPLOAD = 16383
-# Number of minutes between upload: 24 hours
-INTERVAL_MIN_UPLOAD = 1440
-# Number of minutes between forced upload: 5 days
-INTERVAL_MIN_FORCED_UPLOAD = 7200
+# ASN URI v3 to be used by GTP AP modules that
+# can support ASN URI v3 protocol.
+# XT_SERVER_ROOT_URL_V3 = https://gtpma1.izatcloud.net:443/uds/v3
 
-# The minimum time between two collected AP data sets in seconds
-INTERVAL_SEC_AP_SETS_COLLECT = 10
-# Timeout for scan interval when phone is on: 600 seconds (10 minute)
-INTERVAL_SEC_SCAN = 600
-# Timeout for scan interval when phone has not continusouly on for INTERVAL_MIN_SCAN
-INTERVAL_MIN_FORCED_SCAN = 480
+# 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
 
-# Maximum number of Cell DB records for upload
-WWAN_MAX_CELLDB_RECORDS_PER_UPLOAD = 1000
+# 1: MP cell features relies on GTP AP for either download or upload
+# 0: MP cell features does not rely on GTP AP
+# GTP_AP_NEEDED_BY_MP_CELL = 1
 
 ##############################################################################
-# GTP AP cell config                                                         #
+# Configuration items applicable to all devices                              #
 ##############################################################################
-# This item specifies the RIL server name.
-# This configure item can not be removed in Android target.
-XTRAT_WWAN_LITE_LOC_RIL_SERVER_NAME = "OS-Agent"
 
-# Maximum total number of SNA records cached in mobile storage.
-# Max allowed value is 10000
-# Min value is 100
-XTRAT_WWAN_LITE_MAX_DL_SNA = 10000
+# Log verbosity control for most of the GTP WiFi system, including native and
+# Java componenets
+# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5, ALL = 100
+DEBUG_GLOBAL_LOG_LEVEL = 2
+
+# this is used at the server side to distinguish uploads from different maker/model
+# default "Qualcomm"
+OEM_ID_IN_REQUEST_TO_SERVER = "Qualcomm"
 
-# Maximum total number of BSA records cached in mobile storage.
-# Max allowed value is 65000
-# Min value is 100
-XTRAT_WWAN_LITE_MAX_DL_BSA = 65000
+# this is used at the server side to distinguish uploads from different maker/model
+# default "UNKNOWN"
+MODEL_ID_IN_REQUEST_TO_SERVER = "UNKNOWN"
 
 ##############################################################################
 # Qualcomm Network Location Provider config                                  #
 ##############################################################################
+
 # Accuracy Threshold for NLP position. Position exceeds thsi threshold will be filtered out.
 # Default is 25000 meters.
-LARGE_ACCURACY_THRESHOLD_TO_FILTER_NLP_POSITION = 25000
\ No newline at end of file
+LARGE_ACCURACY_THRESHOLD_TO_FILTER_NLP_POSITION = 25000