Update GPS configurations

Remove discontinued blobs, update izat config

Change-Id: I6968c43566b72252bdaed9d79cd3e1c8782733e1

gps/izat.conf

@@ -1,12 +1,8 @@
-########################################
-# NLP/WIFI positioning options bit mask
-########################################
-# Enable NLP fixes for WIPER/ODCPI feature => WIPER = 0x1
-# Enable free wifi scan injections for GEOFENCE => FREE_WIFI = 0x2
-# Enable SUPL2 MLD wifi => SUPL_WIFI = 0x4
-# Enable Attached Wifi AP info injection for GEOFENCE => FREE_AP_INFO = 0x8
-# default = WIPER | FREE_WIFI | SUPL_WIFI | FREE_AP_INFO
-NLP_WIFI_LISTENER_MODE = 15
+#########################################
+# Log verbosity control for izat modules
+#########################################
+# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5
+IZAT_DEBUG_LEVEL = 2
 
 ##################################################
 # Select WIFI Wait Timeout value in seconds for SUPL
@@ -26,14 +22,20 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 # NLP_ACCURACY_MULTIPLE: Determines how far off the accuracy
 # must be, in multiples, between two NLP location reports to
 # be considered much worse accuracy. Used in switching logic
+# NLP COMBO MODE USES QNP WITH NO EULA CONSENT: Determines
+# whether or not to still send network location requests to
+# 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 = 3
 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
 
 # Threshold period for ZPP triggers
-ZPP_TRIGGER_THRESHOLD=10000
+ZPP_TRIGGER_THRESHOLD=60000
 
 ###################################
 # GEOFENCE SERVICES
@@ -83,10 +85,25 @@ GTP_WAA=DISABLED
 # PREMIUM
 SAP=BASIC
 
-#PIP valid modes:
-# DISABLED
-# PREMIUM
-PIP=DISABLED
+#ODCPI valid modes:
+#DISABLED
+#BASIC
+ODCPI=BASIC
+
+#FREE_WIFI_SCAN_INJECT valid modes:
+#DISABLED
+#BASIC
+FREE_WIFI_SCAN_INJECT=BASIC
+
+#SUPL_WIFI valid modes:
+#DISABLED
+#BASIC
+SUPL_WIFI=BASIC
+
+#WIFI_SUPPLICANT_INFO valid modes:
+#DISABLED
+#BASIC
+WIFI_SUPPLICANT_INFO=BASIC
 
 #####################################
 # Location process launcher settings
@@ -97,11 +114,15 @@ PIP=DISABLED
 # DISABLED
 
 #FEATURE MASKS:
-# GTP-WIFI 0X03
-# GTP-CELL 0X0c
-# GTP-WAA  0X300
-# PIP      0x30
-# SAP      0Xc0
+# GTP-WIFI    0X03
+# GTP-AP-CELL 0X0c
+# GTP-MP-CELL 0xc00
+# GTP-WAA     0X300
+# SAP         0Xc0
+# ODCPI      0x1000
+# FREE_WIFI_SCAN_INJECT   0x2000
+# SUPL_WIFI   0x4000
+# WIFI_SUPPLICANT_INFO   0x8000
 
 #Values for PLATFORMS can be:
 #1. Any valid values obtained from ro.board.platform separated by single space. For example: msm8960 msm8226
@@ -111,6 +132,9 @@ PIP=DISABLED
 #1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
 #2. all -> for all basebands
 
+#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_STATE=ENABLED
@@ -119,6 +143,7 @@ PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0
 PLATFORMS=all
 BASEBAND=auto
+LEAN_TARGETS=DISABLED
 
 PROCESS_NAME=/system/bin/gpsone_daemon
 PROCESS_ARGUMENT=
@@ -130,42 +155,12 @@ PLATFORMS=msm7630_fusion
 BASEBAND=svlte2a sglte sglte2
 LEAN_TARGETS=DISABLED
 
-PROCESS_NAME=/system/bin/location-mq
-PROCESS_ARGUMENT=
-PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps
-PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0x3f
-PLATFORMS=all
-BASEBAND=all
-LEAN_TARGETS=ENABLED
-
 PROCESS_NAME=/system/bin/lowi-server
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
 PROCESS_GROUPS=gps net_admin wifi inet qcom_diag net_raw
-PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0x33
-PLATFORMS=all
-BASEBAND=all
-LEAN_TARGETS=DISABLED
-
-PROCESS_NAME=/system/bin/quipc_igsn
-PROCESS_ARGUMENT=
-PROCESS_STATE=ENABLED
-PROCESS_GROUPS=inet gps qcom_diag
-PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0x30
-PLATFORMS=all
-BASEBAND=all
-LEAN_TARGETS=DISABLED
-
-PROCESS_NAME=/system/bin/quipc_main
-PROCESS_ARGUMENT=
-PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_admin wifi inet qcom_diag
-PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0x30
+PREMIUM_FEATURE=0
+IZAT_FEATURE_MASK=0xf303
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
@@ -175,7 +170,7 @@ PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
 PROCESS_GROUPS=inet gps
 PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0x0f
+IZAT_FEATURE_MASK=0xc0f
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
@@ -185,15 +180,15 @@ PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
 PROCESS_GROUPS=net_admin wifi inet gps net_raw rfs_shared
 PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0x30f
+IZAT_FEATURE_MASK=0xf0f
 PLATFORMS=all
 BASEBAND=all
 LEAN_TARGETS=DISABLED
 
-PROCESS_NAME=/system/vendor/bin/slim_ap_daemon
+PROCESS_NAME=/system/vendor/bin/slim_daemon
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_raw misc qcom_oncrpc
+PROCESS_GROUPS=gps net_raw qcom_diag
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0
 PLATFORMS=all

proprietary-files-qc.txt

@@ -120,7 +120,6 @@ vendor/lib/drm/libdrmwvmplugin.so
 vendor/lib/mediadrm/libwvdrmengine.so
 
 # GPS
-bin/location-mq
 etc/permissions/com.qualcomm.location.xml
 -lib64/libloc_api_v02.so
 -lib64/libloc_ds_api.so
@@ -137,7 +136,6 @@ vendor/lib64/libquipc_os_api.so
 vendor/lib64/libulp2.so
 vendor/lib64/libxtadapter.so
 vendor/lib64/libxtwifi_ulp_adaptor.so
-vendor/lib64/libxtwifi_zpp_adaptor.so
 vendor/lib/hw/flp.default.so
 vendor/lib/libgeofence.so
 vendor/lib/libizat_core.so
@@ -148,7 +146,6 @@ vendor/lib/libquipc_os_api.so
 vendor/lib/libulp2.so
 vendor/lib/libxtadapter.so
 vendor/lib/libxtwifi_ulp_adaptor.so
-vendor/lib/libxtwifi_zpp_adaptor.so
 
 # Graphics
 vendor/lib64/egl/eglsubAndroid.so