update config from zui 2.5.334_170116

Change-Id: I135ca385a8d10b8502d15a4ef272be16b4e9fd23

2 files changed, 128 insertions, 28 deletions

diff --git a/gps/etc/gps.conf b/gps/etc/gps.conf
index 4dbf105..edd07c4 100644
--- a/gps/etc/gps.conf
+++ b/gps/etc/gps.conf
@@ -1,8 +1,8 @@
 #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
+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
 
 #Version check for XTRA
 #DISABLE = 0
@@ -16,14 +16,8 @@ XTRA_VERSION_CHECK=0
 # _CLEAR = 0
 ERR_ESTIMATE=0
 
-#Test
-NTP_SERVER=time.gpsonextra.net
-#Asia
-# NTP_SERVER=asia.pool.ntp.org
-#Europe
-# NTP_SERVER=europe.pool.ntp.org
-#North America
-# NTP_SERVER=north-america.pool.ntp.org
+#NTP server
+NTP_SERVER=time.izatcloud.net
 
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
@@ -38,10 +32,10 @@ INTERMEDIATE_POS=0
 # 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 = 3
+#GPS_LOCK = 0
 
 # supl version 1.0
-SUPL_VER=0x20000
+SUPL_VER=0x10000
 
 # Emergency SUPL, 1=enable, 0=disable
 SUPL_ES=0
@@ -49,7 +43,7 @@ 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
@@ -69,7 +63,7 @@ CAPABILITIES=0x37
 
 # Accuracy threshold for intermediate positions
 # less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
+ACCURACY_THRES=100
 
 ################################
 ##### AGPS server settings #####
@@ -77,7 +71,7 @@ CAPABILITIES=0x37
 
 # FOR SUPL SUPPORT, set the following
 SUPL_HOST=supl.google.com
-SUPL_PORT=7275
+SUPL_PORT=7276
 
 # FOR C2K PDE SUPPORT, set the following
 # C2K_HOST=c2k.pde.com or IP
@@ -115,3 +109,72 @@ SGLTE_TARGET=0
 # 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
+LPPE_CP_TECHNOLOGY = 0
+
+##################################################
+# Select technology for LPPe User Plane
+##################################################
+# 0x1: DBH for LPPe UP
+# 0x2: WLAN AP Measurements for 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
+# AP Coarse Timestamp Uncertainty
+##################################################
+# default : 10
+# or as per clock uncertainty of product
+AP_TIMESTAMP_UNCERTAINTY = 10
+
+#####################################
+# GNSS PPS settings
+#####################################
+#AP DR engine availability status
+# 0 : NO AP DR (default)
+# 1 : AP DR enabled
+#EXTERNAL_DR_ENABLED = 0
+
+#####################################
+#DR_SYNC Pulse Availability
+#####################################
+# 0 : DR_SYNC pulse not available (default)
+# 1 : DR_SYNC pulse available
+DR_SYNC_ENABLED = 0
+
+#####################################
+#PPS Device name
+#####################################
+PPS_DEVICENAME = /dev/pps0
+
+#####################################
+#AP Clock Accuracy
+#####################################
+AP_CLOCK_PPM = 100
+
+#####################################
+#MAX ms difference to detect missing pulse
+#####################################
+MISSING_PULSE_TIME_DELTA = 900
+
+#####################################
+#Propagation time uncertainty
+#####################################
+PROPAGATION_TIME_UNCERTAINTY = 1
diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf
index d5d5f9d..93d9501 100644
--- a/gps/etc/izat.conf
+++ b/gps/etc/izat.conf
@@ -12,7 +12,7 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 ################################
 # 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
 # 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 +27,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.
-NLP_MODE = 1
+# QNP preferred mode prefers QNP when there is EULA consent,
+# otherwise OSNLP is used.
+NLP_MODE = 3
+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.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
+# 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
 
@@ -67,12 +82,12 @@ GTP_CELL_PROC=MODEM
 #GTP_CELL valid modes:
 # DISABLED
 # BASIC
-GTP_CELL=DISABLED
+GTP_CELL=BASIC
 
 #GTP_WIFI valid modes:
 # DISABLED
 # BASIC
-GTP_WIFI=DISABLED
+GTP_WIFI=BASIC
 
 #GTP_WAA valid modes:
 # DISABLED
@@ -109,6 +124,10 @@ 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
@@ -126,11 +145,23 @@ WIFI_SUPPLICANT_INFO=BASIC
 
 #Values for PLATFORMS can be:
 #1. Any valid values obtained from ro.board.platform separated by single space. For example: msm8960 msm8226
-#2. all -> for All platforms
+#2. 'all' or 'all exclude' -> for All platforms
+#3. 'all exclude XXXX' -> All platforms exclude XXXX. For example: all exclude msm8937
 
 #Values for BASEBAND can be:
 #1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
-#2. all -> for all basebands
+#2. 'all' or 'all exclude' -> for all basebands
+#3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte
+PROCESS_NAME=/system/bin/DR_AP_Service
+PROCESS_ARGUMENT=
+PROCESS_STATE=DISABLED
+PROCESS_GROUPS=gps net_raw diag qcom_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
@@ -138,32 +169,35 @@ WIFI_SUPPLICANT_INFO=BASIC
 PROCESS_NAME=/system/bin/garden_app
 PROCESS_ARGUMENT=-u 0 -q 0 -j 0 -g 0 -l 0 -Z 0 -T 1
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_raw
+PROCESS_GROUPS=gps
 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_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_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_admin wifi inet qcom_diag net_raw
+PROCESS_GROUPS=gps net_admin wifi inet qcom_diag
 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_ARGUMENT=
@@ -174,23 +208,26 @@ IZAT_FEATURE_MASK=0xc0f
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
+HARDWARE_TYPE=all
 
 PROCESS_NAME=/system/bin/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_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_raw qcom_diag
+PROCESS_GROUPS=gps qcom_diag can
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
+HARDWARE_TYPE=all