d855: Revert gps.conf to D855 21C and pick some changes from 30B

* SUPL_MODE=1
* gpsonextra.net -> izatcloud.net

Change-Id: I43395d9037fddf87e91cb9f8c64ff581310547d3

1 files changed, 89 insertions, 170 deletions

diff --git a/configs/gps.conf b/configs/gps.conf
index b35749f..192db9e 100644
--- a/configs/gps.conf
+++ b/configs/gps.conf
@@ -1,79 +1,63 @@
-# This configuration file (GPS) is automatically generated from shell script.
-#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
-# TODO:LGE_GNSS: Please DO enable the next line when you merge the CAF
-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
-#AUTO    = 1
-#XTRA2   = 2
-#XTRA3   = 3
-XTRA_VERSION_CHECK=0
-
-# Error Estimate
-# _SET = 1
-# _CLEAR = 0
-ERR_ESTIMATE=0
-
 #Test
-NTP_SERVER=europe.pool.ntp.org
+#NTP_SERVER=time.gpsonextra.net
 #Asia
 # NTP_SERVER=asia.pool.ntp.org
 #Europe
-# NTP_SERVER=europe.pool.ntp.org
+NTP_SERVER=europe.pool.ntp.org
+NTP_SERVER_SCA=south-america.pool.ntp.org
+NTP_SERVER_AME=asia.pool.ntp.org
+NTP_SERVER_AU=oceania.pool.ntp.org
+NTP_SERVER_CN=cn.pool.ntp.org
 #North America
 # NTP_SERVER=north-america.pool.ntp.org
+#Korea
+#NTP_SERVER=0.kr.pool.ntp.org
+#JP
+# NTP_SERVER=3.jp.pool.ntp.org
+
+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
 
 # 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=2
+DEBUG_LEVEL = 2
 
 # 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
-# TODO:GNSS_LGE: Please DO enable the next line when you merge the CAF
-GPS_LOCK=0x0
-
 # supl version 1.0
+#SUPL_VER=0x10000
+# supl version 2.0
 SUPL_VER=0x20000
 
-# Emergency SUPL, 1=enable, 0=disable
-SUPL_ES=0
+#VDF supl version
+SUPL_VER_262_2=0x20000
+SUPL_VER_214_1=0x20000
+SUPL_VER_222_10=0x20000
 
-#Choose PDN for Emergency SUPL
-#1 - Use emergency PDN
-#0 - Use regular SUPL PDN for Emergency SUPL
-USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0
+# Error Estimate
+# _SET = 1
+# _CLEAR = 0
+ERR_ESTIMATE=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 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=
 # TODO:LGE_GNSS: Please DO enable the next line when you merge the CAF
 SUPL_MODE=1
 
 # GPS Capabilities bit mask
-# SCHEDULING = 0x01
-# MSB = 0x02
-# MSA = 0x04
-# ON_DEMAND_TIME = 0x10
-# GEOFENCE = 0x20
-# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
+# SCHEDULING = 1
+# MSB = 2
+# MSA = 4
+# ON_DEMAND_TIME=0x10
+# ULP = 0x20
+# default = MSA | MSB | SCHEDULING | ULP | ON_DEMAND_TIME
+# CAPABILITIES=0x33
 CAPABILITIES=0x33
 
 # Accuracy threshold for intermediate positions
@@ -87,146 +71,81 @@ CAPABILITIES=0x33
 # FOR SUPL SUPPORT, set the following
 # SUPL_HOST=supl.host.com or IP
 # SUPL_PORT=1234
-# TODO:LGE_GNSS: Please DO enable the next line when you merge the CAF
 SUPL_HOST=supl.google.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=0
-
-################################
-# EXTRA SETTINGS
-################################
-# NMEA provider (1=Modem Processor, 0=Application Processor)
-NMEA_PROVIDER=1
-# 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=0x0
-
-################################
-# LGE EXTRA SETTINGS
-################################
-VENDOR=GLOBAL
-LGE_TLS_MODE=1
-LGE_GPS_POSITION_MODE=1
-LGE_IMPROVE_LOCATION_ERROR=1
-
-################################
-# LGE GLOBAL SUPL SETTINGS
-################################
-#NTP_SERVER#
-NTP_SERVER_KR=0.kr.pool.ntp.org
-NTP_SERVER_US=north-america.pool.ntp.org
-NTP_SERVER_EU=europe.pool.ntp.org
-NTP_SERVER_CIS=ru.pool.ntp.org
-NTP_SERVER_ESA=asia.pool.ntp.org
-NTP_SERVER_TW=tw.pool.ntp.org
-NTP_SERVER_AU=oceania.pool.ntp.org
-NTP_SERVER_SCA=south-america.pool.ntp.org
-NTP_SERVER_AME=africa.pool.ntp.org
-
-#SUPL_VER#
-SUPL_VER_262_2=0x20000
-SUPL_VER_214_1=0x20000
-SUPL_VER_222_10=0x20000
-SUPL_VER_UNF=0x10000
-
-#SUPL_HOST#
+#VDF supl server and port
 SUPL_HOST_262_2=supl.vodafone.com
+SUPL_PORT_262_2=7275
 SUPL_HOST_214_1=supl.vodafone.com
-SUPL_HOST_214_18=supl.vodafone.com
+SUPL_PORT_214_1=7275
 SUPL_HOST_222_10=supl.vodafone.com
+SUPL_PORT_222_10=7275
 SUPL_HOST_204_4=supl.vodafone.com
+SUPL_PORT_204_4=7275
 SUPL_HOST_268_1=supl.vodafone.com
+SUPL_PORT_268_1=7275
 SUPL_HOST_226_1=supl.vodafone.com
+SUPL_PORT_226_1=7275
 SUPL_HOST_202_5=supl.vodafone.com
+SUPL_PORT_202_5=7275
 SUPL_HOST_530_1=supl.vodafone.com
+SUPL_PORT_530_1=7275
 SUPL_HOST_276_2=supl.vodafone.com
+SUPL_PORT_276_2=7275
 SUPL_HOST_278_1=supl.vodafone.com
+SUPL_PORT_278_1=7275
 SUPL_HOST_234_15=supl.vodafone.com
+SUPL_PORT_234_15=7275
 SUPL_HOST_286_2=supl.vodafone.com
-SUPL_HOST_505_3=supl.vodafone.com
+SUPL_PORT_286_2=7275
+
+#UNF host,port
+SUPL_HOST_UNF=supl.iusacell.com
+SUPL_PORT_UNF=7275
+SUPL_VER_UNF=0x10000
+
+#SFR supl server and port
 SUPL_HOST_208_10=supl.google.com
 SUPL_HOST_647_10=supl.google.com
 SUPL_HOST_208_9=supl.google.com
-SUPL_HOST_UNF=supl.iusacell.com
-SUPL_HOST_NXT=location.entel.pe
-
-#SUPL_PORT#
-SUPL_PORT_262_2=7275
-SUPL_PORT_214_1=7275
-SUPL_PORT_214_18=7275
-SUPL_PORT_222_10=7275
-SUPL_PORT_204_4=7275
-SUPL_PORT_268_1=7275
-SUPL_PORT_226_1=7275
-SUPL_PORT_202_5=7275
-SUPL_PORT_530_1=7275
-SUPL_PORT_276_2=7275
-SUPL_PORT_278_1=7275
-SUPL_PORT_234_15=7275
-SUPL_PORT_286_2=7275
-SUPL_PORT_505_3=7275
 SUPL_PORT_208_10=7275
 SUPL_PORT_647_10=7275
 SUPL_PORT_208_9=7275
-SUPL_PORT_UNF=7275
-SUPL_PORT_NXT=7275
-
-#LGE_TLS_MODE#
-LGE_TLS_MODE_262_2=1
-LGE_TLS_MODE_214_1=1
-LGE_TLS_MODE_222_10=1
-LGE_TLS_MODE_204_4=1
-LGE_TLS_MODE_268_1=1
-LGE_TLS_MODE_226_1=1
-LGE_TLS_MODE_202_5=1
-LGE_TLS_MODE_530_1=1
-LGE_TLS_MODE_276_2=1
-LGE_TLS_MODE_278_1=1
-LGE_TLS_MODE_234_15=1
-LGE_TLS_MODE_286_2=1
-LGE_TLS_MODE_505_3=1
-LGE_TLS_MODE_208_10=1
-LGE_TLS_MODE_647_10=1
-LGE_TLS_MODE_208_9=1
-LGE_TLS_MODE_UNF=7
+
+# FOR C2K PDE SUPPORT, set the following
+# C2K_HOST=c2k.pde.com or IP
+# C2K_PORT=1234
 
 ################################
-# LGE DEBUG INFORMATION
+# Indoor Positioning Settings
 ################################
+# 0: QUIPC disabled, 1: QUIPC enabled, 2: forced QUIPC only
+QUIPC_ENABLED = 0
 
-# [1] target__Product= g3_global_com
-# [2] target__Device=  g3
-# [3] target__Carrier= GLOBAL
-# [4] target__Country= COM
-# [5] target__Chipset= MSM8974
-# [6] target__EngineVer=  GEN8B
-# [7] target__BuildVariant= 
+################################
+# EXTRA SETTINGS
+################################
+# Enable or Disable Wiper (1=Enable, 0=Disable)
+#ENABLE_WIPER=1
+ENABLE_WIPER=0
+# NMEA provider (1=Modem Processor, 0=Application Processor)
+#NMEA_PROVIDER=0
+NMEA_PROVIDER=1
 
-##############EOF################
\ No newline at end of file
+####################################
+#  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 = 0
+
+##################################################
+# Select Positioning Protocol on A-GLONASS system
+##################################################
+# 0x1: RRC CPlane
+# 0x2: RRLP UPlane
+# 0x4: LLP Uplane
+A_GLONASS_POS_PROTOCOL_SELECT = 0