axolotl: Switch back to stock GNSS stack
Change-Id: I4950f621fc139daf70cfa9643ae4a1d22e6f4e2f
diff --git a/configs/gps/gps.conf b/configs/gps/gps.conf
index c899fa6..78e5d84 100644
--- a/configs/gps/gps.conf
+++ b/configs/gps/gps.conf
@@ -1,13 +1,9 @@
-XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra3grcej.bin
-XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra3grcej.bin
-XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra3grcej.bin
-
#Version check for XTRA
#DISABLE = 0
#AUTO = 1
#XTRA2 = 2
#XTRA3 = 3
-XTRA_VERSION_CHECK=3
+XTRA_VERSION_CHECK=0
# Error Estimate
# _SET = 1
@@ -28,30 +24,23 @@
# 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 both MO and NI locked for maximal privacy
-#GPS_LOCK = 3
-
-# supl version 2.0
-SUPL_VER=0x20000
+# supl version 1.0
+SUPL_VER=0x10000
# Emergency SUPL, 1=enable, 0=disable
-SUPL_ES=0
+#SUPL_ES=1
#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
#config.xml.
#MSA=0X2
#MSB=0X1
-SUPL_MODE=1
+#SUPL_MODE=
# GPS Capabilities bit mask
# SCHEDULING = 0x01
@@ -70,8 +59,8 @@
################################
# FOR SUPL SUPPORT, set the following
-SUPL_HOST=supl.google.com
-SUPL_PORT=7275
+# SUPL_HOST=supl.host.com or IP
+# SUPL_PORT=1234
# FOR MO SUPL SUPPORT, set the following
# MO_SUPL_HOST=supl.host.com or IP
@@ -87,7 +76,7 @@
# are writable. For example, AGPS_CERT_WRITABLE_MASK
# of b1000001010 makes 3 slots available
# and the remaining 7 slots unwritable.
-AGPS_CERT_WRITABLE_MASK=1
+#AGPS_CERT_WRITABLE_MASK=0
####################################
# LTE Positioning Profile Settings
@@ -96,7 +85,7 @@
# 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
+LPP_PROFILE = 2
####################################
#Datum Type
@@ -110,6 +99,31 @@
################################
# NMEA provider (1=Modem Processor, 0=Application Processor)
NMEA_PROVIDER=0
+
+# Customized NMEA GGA fix quality that can be used to tell
+# whether SENSOR contributed to the fix.
+#
+# When this configuration item is not enabled (set to any value that is not 1),
+# GGA fix quality conforms to NMEA standard spec as below:
+# PPP/DGNSS/SBAS correction fix w/ or w/o sensor: 2
+# RTK fixed fix w/ or w/o sensor: 4
+# RTK float fix w/ or w/o sensor: 5
+# SPE fix w/ or w/o sensor: 1
+# Sensor dead reckoning fix: 6
+#
+# When this configuration is enabled (set to 1), GGA fix quality
+# will be output as below:
+# PPP fix w/o sensor: 59, w/ sensor: 69
+# DGNSS/SBAS correction fix w/o sensor: 2, w/ sensor: 62
+# RTK fixed fix w/o sensor: 4, w/ sensor: 64
+# RTK float fix w/o sensor: 5, w/ sensor: 65,
+# SPE fix w/o sensor: 1, and w/ sensor: 61
+# Sensor dead reckoning fix: 6
+#
+# any value that is not 1 - disabled
+# 1 - enabled
+CUSTOM_NMEA_GGA_FIX_QUALITY_ENABLED = 0
+
# Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE)
SGLTE_TARGET=0
@@ -304,7 +318,29 @@
##################################################
# 0 : Enable QTI GNSS (default)
# 1 : Enable QCSR SS5
-# This setting use to select between QTI GNSS
-# and QCSR SS5 hardware receiver.
+# 2 : Enable PDS API
+# This setting use to select between QTI GNSS,
+# QCSR SS5 hardware receiver, and PDS API.
# By default QTI GNSS receiver is enabled.
# GNSS_DEPLOYMENT = 0
+
+##################################################
+## LOG BUFFER CONFIGURATION
+##################################################
+#LOG_BUFFER_ENABLED, 1=enable, 0=disable
+#*_LEVEL_TIME_DEPTH, maximum time depth of level *
+#in log buffer, unit is second
+#*_LEVEL_MAX_CAPACITY, maximum numbers of level *
+#log print sentences in log buffer
+LOG_BUFFER_ENABLED = 0
+E_LEVEL_TIME_DEPTH = 600
+E_LEVEL_MAX_CAPACITY = 50
+W_LEVEL_TIME_DEPTH = 500
+W_LEVEL_MAX_CAPACITY = 100
+I_LEVEL_TIME_DEPTH = 400
+I_LEVEL_MAX_CAPACITY = 200
+D_LEVEL_TIME_DEPTH = 30
+D_LEVEL_MAX_CAPACITY = 300
+V_LEVEL_TIME_DEPTH = 200
+V_LEVEL_MAX_CAPACITY = 400
+
diff --git a/configs/gps/izat.conf b/configs/gps/izat.conf
index 9a99361..fb13e12 100644
--- a/configs/gps/izat.conf
+++ b/configs/gps/izat.conf
@@ -93,8 +93,15 @@
# DISABLED
# LEGACY_WWAN
# SDK (WWAN not available for Modems before LocTech 10.0)
+# SDK_WIFI (WWAN provided by legacy Modem)
GTP_MODE=DISABLED
+#FUSED_HAL_ONLY
+# This setting enables HW FLP over Gnss HIDL.
+# ENABLED
+# DISABLED
+FUSED_HAL_ONLY=DISABLED
+
#GTP_WAA valid modes:
# DISABLED
# BASIC
@@ -134,6 +141,12 @@
# ENABLED
# DISABLED
+#Values for LOW_RAM_TARGETS:
+# ENABLED
+# DISABLED
+# Property to enable/disable processes for low ram targets. Uses ro.config.low_ram property
+# to identify low ram targets.
+
#PROCESS_NAME
# Name of the executable file.
@@ -152,6 +165,14 @@
#2. 'all' or 'all exclude' -> for All platforms
#3. 'all exclude XXXX' -> All platforms exclude XXXX. For example: all exclude msm8937
+#Values for SOC_IDS can be:
+#1. Any valid values obtained from soc_id node separated by single space. For example: 339 386 436
+## soc_id value can be obtained from any one of below node:
+## - /sys/devices/soc0/soc_id
+## - /sys/devices/system/soc/soc0/id
+#2. 'all' or 'all exclude' -> for All soc id's
+#3. 'all exclude XXXX' -> All soc id's exclude XXXX. For example: all exclude 339 386
+
#Values for BASEBAND can be:
#1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
#2. 'all' or 'all exclude' -> for all basebands
@@ -163,29 +184,35 @@
PREMIUM_FEATURE=0
IZAT_FEATURE_MASK=0xf303
PLATFORMS=all
+SOC_IDS=all
BASEBAND=all
+LOW_RAM_TARGETS=DISABLED
HARDWARE_TYPE=all
VENDOR_ENHANCED_PROCESS=0
PROCESS_NAME=xtwifi-inet-agent
PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
PROCESS_GROUPS=inet gps
PREMIUM_FEATURE=1
IZAT_FEATURE_MASK=0xc03
PLATFORMS=all
+SOC_IDS=all
BASEBAND=all
+LOW_RAM_TARGETS=DISABLED
HARDWARE_TYPE=all
VENDOR_ENHANCED_PROCESS=1
PROCESS_NAME=xtwifi-client
PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
PROCESS_GROUPS=wifi inet gps system oem_2904
PREMIUM_FEATURE=1
IZAT_FEATURE_MASK=0xd03
PLATFORMS=all
+SOC_IDS=all
BASEBAND=all
+LOW_RAM_TARGETS=DISABLED
HARDWARE_TYPE=all
VENDOR_ENHANCED_PROCESS=1
@@ -196,7 +223,9 @@
PREMIUM_FEATURE=1
IZAT_FEATURE_MASK=0xf0
PLATFORMS=all
+SOC_IDS=all exclude 386 436
BASEBAND=all
+LOW_RAM_TARGETS=DISABLED
HARDWARE_TYPE=all
VENDOR_ENHANCED_PROCESS=1
@@ -207,7 +236,9 @@
PREMIUM_FEATURE=0
IZAT_FEATURE_MASK=0
PLATFORMS=all
+SOC_IDS=all
BASEBAND=all
+LOW_RAM_TARGETS=ENABLED
HARDWARE_TYPE=all
VENDOR_ENHANCED_PROCESS=0
@@ -223,7 +254,9 @@
PREMIUM_FEATURE=0
IZAT_FEATURE_MASK=0
PLATFORMS=all
+SOC_IDS=all
BASEBAND=all
+LOW_RAM_TARGETS=DISABLED
HARDWARE_TYPE=all
VENDOR_ENHANCED_PROCESS=1
@@ -242,6 +275,8 @@
PREMIUM_FEATURE=0
IZAT_FEATURE_MASK=0
PLATFORMS=all
+SOC_IDS=all
BASEBAND=all
+LOW_RAM_TARGETS=DISABLED
HARDWARE_TYPE=all
VENDOR_ENHANCED_PROCESS=1
diff --git a/device.mk b/device.mk
index 43d6bf2..77600f0 100644
--- a/device.mk
+++ b/device.mk
@@ -279,8 +279,8 @@
# GPS
PRODUCT_PACKAGES += \
- android.hardware.gnss@2.1.vendor \
- android.hardware.gnss@2.1-service-qti \
+ android.hardware.gnss@2.0.vendor \
+ android.hardware.gnss@2.0-service-qti \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f5bf8ae..6a31098 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -447,59 +447,54 @@
vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so
vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
-# GNSS - from PNX - RKQ1.200906.002
-vendor/bin/hw/android.hardware.gnss@2.1-service-qti|bd3d5174f69cf65047c8d8b159554515b0f3d022
-vendor/bin/loc_launcher|bf13787d95c2fec6fadb2552fa63b12ab606575c
-vendor/bin/lowi-server|1898971a9a10d8a849a436e1bcbf1ab60b8ac0de
-vendor/bin/mlid|1345e5df78c7fb2583af0c4e046ae6d21a4e75da
-vendor/bin/slim_daemon|102d6b5b4f8748cb5579056d8c3ec49a72e57009
-vendor/bin/xtra-daemon|5cfbfc2ba4e9f18e966987662471c5bfa737dcaa
-vendor/bin/xtwifi-client|442e0c8166eea0a0d6cfd9432f945faa59c34d80
-vendor/bin/xtwifi-inet-agent|f805841e5c8ca3b0af620486a64a37148daa0980
-vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc|d3844699c845ce5de4c8b50548a2095f92dd0235
-vendor/etc/vintf/manifest/android.hardware.gnss@2.1-service-qti.xml|1c344aacaa6d17a1585ba58b2e6d438dcfe31fad
-vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml|6514b13f55abc0acc28e004c35ff93fb972d61a9
-vendor/etc/cacert_location.pem|0789bf799c7e45d352a83e2f79ddb0cea86db85b
-vendor/etc/xtra_root_cert.pem|f55a31ec4d9cf8ce2724acadecf00c779f8767db
-vendor/lib64/hw/android.hardware.gnss@2.1-impl-qti.so|6e4305828e4d42111aaa28167f0d260bfa13b83d
-vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so|b94476f03424846bcf2bcecbf290d992a5cdbc09
-vendor/lib64/libaoa.so|548073afa1ce13cb9d9b252dd933e91d835f02d8
-vendor/lib64/libbatching.so|eafd89f91d275c9946a66f0f322ea4c0fa1cc5d0
-vendor/lib64/libcacertclient.so|90281ef665d6a66ad7aa0806d97c20866fe1a83d
-vendor/lib64/libcdfw_remote_api.so|2939e767c15fd965322d6e11045fa3fb851b29d4
-vendor/lib64/libdataitems.so|f13cb93394d8aae1eef85c4730b5c8f9ace092a9
-vendor/lib64/libgdtap.so|510075724d368816c89a5f9e76b2529484e03d36
-vendor/lib64/libgeofencing.so|a6fffe98ddc82de53cf353c4f3fca602702a8330
-vendor/lib64/libgnss.so|cfd6a2f021e63a1a47346b6f46bdbb916e7d9b43
-vendor/lib64/libgnsspps.so|f8b2e3f70d4e51982b061dcd6d26a6ead45b4900
-vendor/lib64/libgps.utils.so|e178821db6e45204310da49b173eb0f63a4f56f0
-vendor/lib64/libizat_client_api.so|c4bab8714a378aa5773a24c78d7b7af09437dc47
-vendor/lib64/libizat_core.so|aecb6d3f4ceba32a4524cb086afc39f13fd1e69f
-vendor/lib64/libjnihelper.so|fb8690fbb5b8fbb97ded1bd8d4f87285ec74cf41
-vendor/lib64/liblbs_core.so|783ea543eb99f612f8000d48c298cf26146277df
-vendor/lib64/libloc_api_v02.so|2a98b16df385a6b73f93b86974b63fb318d58761
-vendor/lib64/libloc_core.so|107da3079c22d9505d3737033bab1e22c3005f53
-vendor/lib64/libloc_socket.so|10a385d643babf67edaab4a616987bd16212bb7f
-vendor/lib64/liblocation_api.so|fe3a227e511bfd52a6c52efae64ac32cfc492669
-vendor/lib64/liblocationservice.so|b1553eb7c02451d7570d0e91bf33be91d8cdb7ff
-vendor/lib64/liblocationservice_glue.so|d08f9e61fc5f731b224692f434cf43a4aa2b6eb8
-vendor/lib64/liblowi_client.so|fd5cb6bb1c4eaacf3ef8a93e083d37d117137096
-vendor/lib64/liblowi_wifihal.so|db68a6c99c2fb8315d5f7a6954cdcb894a7de8ad
-vendor/lib64/libminksocket.so|fa81f5c47ee5a1f05fee71c464095bb1e89c26fd
-vendor/lib64/libmmosal.so|e9fdb48163e92b089cea0c397723a8416436c272
-vendor/lib64/libqcc_file_agent.so|ddfc0babc52ab12b6b159b36505bc0b5ef460a0a
-vendor/lib64/libslimclient.so|4ef9783dfa3c3815b7a3caa6b634de5158a866be
-vendor/lib64/libsynergy_loc_api.so
-vendor/lib64/libxtadapter.so|453f9095f8979213c5bec9de73b1b7c6d085e265
-vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so|19a1f7ffb8118c207aa8cb2318996605771c339a
-vendor/lib64/vendor.qti.gnss@1.0.so|7d6828171016def19f56c6986b2ce1d08fe3ec57
-vendor/lib64/vendor.qti.gnss@1.1.so|786e0626473bdee3e55c9f5f34ee0f1c21a08f5d
-vendor/lib64/vendor.qti.gnss@1.2.so|e0b46a905d1aa17b6667bcbec42bce60a03129c1
-vendor/lib64/vendor.qti.gnss@2.0.so|60f8a7f1cfd27da6394373e9b34e733b3701ad04
-vendor/lib64/vendor.qti.gnss@2.1.so|391a0e7bdd477ba519aaddc1b0711840e3362dc8
-vendor/lib64/vendor.qti.gnss@3.0.so|b67a1ff507cfb4165a9dc970dc54aa26cc731e6f
-vendor/lib64/vendor.qti.gnss@4.0-service.so|3c75d133af5193436167380aa89abcf05d079968
-vendor/lib64/vendor.qti.gnss@4.0.so|7d343c73e6720434045cc38ea0e570ae9d03cd51
+# GNSS
+vendor/bin/hw/android.hardware.gnss@2.0-service-qti
+vendor/bin/loc_launcher
+vendor/bin/lowi-server
+vendor/bin/mlid
+vendor/bin/slim_daemon
+vendor/bin/xtra-daemon
+vendor/bin/xtwifi-client
+vendor/bin/xtwifi-inet-agent
+vendor/etc/init/android.hardware.gnss@2.0-service-qti.rc
+vendor/etc/vintf/manifest/android.hardware.gnss@2.0-service-qti.xml
+vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml
+vendor/etc/cacert_location.pem
+vendor/etc/xtra_root_cert.pem
+vendor/lib64/hw/android.hardware.gnss@2.0-impl-qti.so
+vendor/lib64/hw/vendor.qti.gnss@3.0-impl.so
+vendor/lib64/libaoa.so
+vendor/lib64/libbatching.so
+vendor/lib64/libcacertclient.so
+vendor/lib64/libdataitems.so
+vendor/lib64/libgdtap.so
+vendor/lib64/libgeofencing.so
+vendor/lib64/libgnss.so
+vendor/lib64/libgnsspps.so
+vendor/lib64/libgps.utils.so
+vendor/lib64/libizat_client_api.so
+vendor/lib64/libizat_core.so
+vendor/lib64/libjnihelper.so
+vendor/lib64/liblbs_core.so
+vendor/lib64/libloc_api_v02.so
+vendor/lib64/libloc_core.so
+vendor/lib64/libloc_socket.so
+vendor/lib64/liblocation_api.so
+vendor/lib64/liblocationservice.so
+vendor/lib64/liblocationservice_glue.so
+vendor/lib64/liblowi_client.so
+vendor/lib64/liblowi_wifihal.so
+vendor/lib64/libminksocket.so
+vendor/lib64/libqdma_file_agent.so
+vendor/lib64/libslimclient.so
+vendor/lib64/libxtadapter.so
+vendor/lib64/vendor.qti.gnss@1.0.so
+vendor/lib64/vendor.qti.gnss@1.1.so
+vendor/lib64/vendor.qti.gnss@1.2.so
+vendor/lib64/vendor.qti.gnss@2.0.so
+vendor/lib64/vendor.qti.gnss@2.1.so
+vendor/lib64/vendor.qti.gnss@3.0-service.so
+vendor/lib64/vendor.qti.gnss@3.0.so
# Graphics (Adreno) - from PNX - RKQ1.200906.002
vendor/lib/egl/eglSubDriverAndroid.so|cc5acc02889131a29b624b4c19ab90b8273f393d