aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gps/etc/izat.conf15
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml6
-rwxr-xr-xsetup-makefiles.sh12
3 files changed, 10 insertions, 23 deletions
diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf
index 17098a2..f98ee70 100644
--- a/gps/etc/izat.conf
+++ b/gps/etc/izat.conf
@@ -27,10 +27,7 @@ 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.
-# QNP preferred mode prefers QNP when there is EULA consent,
-# otherwise OSNLP is used.
-NLP_MODE = 3
-NLP_MODE_EMERGENCY = 2
+NLP_MODE = 1
NLP_TOLERANCE_TIME_FIRST = 5000
NLP_TOLERANCE_TIME_AFTER = 20000
NLP_THRESHOLD = 3
@@ -82,7 +79,7 @@ GTP_CELL_PROC=MODEM
#GTP_CELL valid modes:
# DISABLED
# BASIC
-GTP_CELL=BASIC
+GTP_CELL=DISABLED
#GTP_WIFI valid modes:
# DISABLED
@@ -103,22 +100,22 @@ SAP=PREMIUM
#ODCPI valid modes:
#DISABLED
#BASIC
-ODCPI=BASIC
+ODCPI=DISABLED
#FREE_WIFI_SCAN_INJECT valid modes:
#DISABLED
#BASIC
-FREE_WIFI_SCAN_INJECT=BASIC
+FREE_WIFI_SCAN_INJECT=DISABLED
#SUPL_WIFI valid modes:
#DISABLED
#BASIC
-SUPL_WIFI=BASIC
+SUPL_WIFI=DISABLED
#WIFI_SUPPLICANT_INFO valid modes:
#DISABLED
#BASIC
-WIFI_SUPPLICANT_INFO=BASIC
+WIFI_SUPPLICANT_INFO=DISABLED
#####################################
# Location process launcher settings
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1b312be..06b1982 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -489,9 +489,7 @@
</string-array>
<!-- Enable overlay for all location components. -->
- <bool name="config_enableNetworkLocationOverlay" translatable="false">false</bool>
- <bool name="config_enableFusedLocationOverlay" translatable="false">false</bool>
<string name="config_networkLocationProviderPackageName" translatable="false">com.qualcomm.location</string>
<string name="config_fusedLocationProviderPackageName" translatable="false">com.qualcomm.location</string>
- <string name="config_comboNetworkLocationProvider" translatable="false">com.qualcomm.location</string>
-/resources>
+
+</resources>
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index a0e6e50..2304bf5 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -33,19 +33,11 @@ CM_ROOT="$MY_DIR"/../../..
printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$PRODUCTMK"
printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$ANDROIDMK"
-<<<<<<< HEAD
+
# Qualcomm performance blobs - conditional as well
# in order to support LineageOS builds
-cat << EOF >> "$PRODUCTMK"
+
endif
-=======
-PRODUCT_PACKAGES += \\
- CNEService \\
- com.qualcomm.location \\
- dpmserviceapp \\
- qcrilmsgtunnel \\
- QtiTetherService
->>>>>>> 05c9d04... gemini: Enable QC location services
-include vendor/extra/devices.mk
ifneq (\$(call is-qc-perf-target),true)