msm8996-common: Update to stock GPS configs and clean up

 * Remove QC location and other unused GPS blobs

 * Ship with the same premium features enabled in stock builds

Change-Id: I2e76e45160f028464eca34bb78da028f7d8dba8c

3 files changed, 21 insertions, 8 deletions

diff --git a/gps/etc/gps.conf b/gps/etc/gps.conf
index 3caef9c..2ef3f2d 100644
--- a/gps/etc/gps.conf
+++ b/gps/etc/gps.conf
@@ -18,6 +18,8 @@ ERR_ESTIMATE=0
 
 #NTP server
 NTP_SERVER=time.izatcloud.net
+NTP_SERVER_2=asia.pool.ntp.org
+NTP_SERVER_3=0.cn.pool.ntp.org
 
 #XTRA CA path
 XTRA_CA_PATH=/system/etc/security/cacerts
@@ -28,7 +30,7 @@ XTRA_CA_PATH=/system/etc/security/cacerts
 DEBUG_LEVEL = 2
 
 # Intermediate position report, 1=enable, 0=disable
-INTERMEDIATE_POS=0
+INTERMEDIATE_POS=1
 
 # Below bit mask configures how GPS functionalities
 # should be locked when user turns off GPS on Settings
@@ -66,7 +68,7 @@ CAPABILITIES=0x37
 
 # Accuracy threshold for intermediate positions
 # less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
+ACCURACY_THRES=70
 
 ################################
 ##### AGPS server settings #####
@@ -95,7 +97,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
@@ -205,3 +207,10 @@ MISSING_PULSE_TIME_DELTA = 900
 # This settings enables time uncertainty propagation
 # logic incase of missing PPS pulse
 PROPAGATION_TIME_UNCERTAINTY = 1
+XTRA_TEST_ENABLED = 1
+XTRA_THROTTLE_ENABLED = 0
+
+####################################
+#system time injection
+####################################
+XTRA_SYSTEM_TIME_INJECT = 1
diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf
index 05276a8..57285c9 100644
--- a/gps/etc/izat.conf
+++ b/gps/etc/izat.conf
@@ -55,7 +55,7 @@ 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_PACKAGE = com.google.android.gms
 #REGION_OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider
 
 # Threshold period for ZPP triggers
@@ -119,7 +119,7 @@ GTP_WAA=DISABLED
 # DISABLED
 # BASIC
 # PREMIUM
-SAP=BASIC
+SAP=PREMIUM
 
 #ODCPI valid modes:
 #DISABLED
@@ -192,7 +192,7 @@ HARDWARE_TYPE=automotive
 #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=ENABLED
+PROCESS_STATE=DISABLED
 PROCESS_GROUPS=gps diag
 PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0
@@ -275,3 +275,7 @@ HARDWARE_TYPE=all
 # XTRA client.
 ##################################################
 # XC20_LAUNCH_PROCESS_NAME=garden_app
+
+#Accuracy threshold for ZPP positions
+# less accurate positions are ignored
+ZPP_ACCURACY_THRESHOLD=1000
diff --git a/gps/etc/sap.conf b/gps/etc/sap.conf
index eb21f01..372eb49 100644
--- a/gps/etc/sap.conf
+++ b/gps/etc/sap.conf
@@ -27,7 +27,7 @@ SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25
 
 # Sensor Control Mode (0=AUTO, 1=FORCE_ON)
 # used in loc_eng_reinit
-SENSOR_CONTROL_MODE=0
+SENSOR_CONTROL_MODE=1
 
 # Enable or Disable Sensors for GPS use (0=Enable, 1=Disable)
 # used in loc_eng_reinit
@@ -40,7 +40,7 @@ SENSOR_PROVIDER=1
 # Setting each bit has the following definition:
 #  0x1 - DISABLE_INS_POSITIONING_FILTER
 #  0x0 - ENABLE_INS_POSITIONING_FILTER
-SENSOR_ALGORITHM_CONFIG_MASK=0x1
+SENSOR_ALGORITHM_CONFIG_MASK=0x0
 
 #Vehicle Network Provider configuration