From bf7db64e6b28904b9fc2c4728ce9a295756b0a37 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Sun, 12 Aug 2018 21:16:42 +0200
Subject: [PATCH] d855: gps: Move XTRA_SERVER entries to overlays

* XTRA_SERVERs are important, right? Like to get the almanac data
  necessary for aGPS. Without the XTRA download, the chip needs to
  collect sufficient navigation messages from the birds to compute
  where they are in order to make sense of the ranging signals.
* Well, it seems that O doesn't like reading these entries from the
  gps.conf file.

  When in gps.conf:
  GpsXtraDownloader: No XTRA servers were specified in the GPS configuration

  When in overlay:
  <that noise doesn't exist>

* This seems to return GPS fix performance to what we had in N.

Change-Id: Ifbdbf003384143b55dab9764f419e7f9863de8d2
---
 configs/gps.conf                                  |  6 +++---
 .../base/core/res/res/values/config.xml           | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/configs/gps.conf b/configs/gps.conf
index 2100a15..bcb3608 100644
--- a/configs/gps.conf
+++ b/configs/gps.conf
@@ -5,9 +5,9 @@
 #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
+#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
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 57f9ea5..94cd191 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -27,4 +27,19 @@
          provisioning, availability etc -->
     <bool name="config_carrier_volte_available">true</bool>
 
+    <!-- Values for GPS configuration -->
+    <string-array translatable="false" name="config_gpsParameters">
+        <item>SUPL_HOST=supl.google.com</item>
+        <item>SUPL_PORT=7275</item>
+        <item>SUPL_VER=0x20000</item>
+        <item>SUPL_MODE=1</item>
+        <item>SUPL_ES=0</item>
+        <item>LPP_PROFILE=0</item>
+        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0</item>
+        <item>A_GLONASS_POS_PROTOCOL_SELECT=15</item>
+        <item>GPS_LOCK=0</item>
+        <item>XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra3grc.bin</item>
+        <item>XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra3grc.bin</item>
+        <item>XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra3grc.bin</item>
+    </string-array>
 </resources>