From 99c49346fc75de3a5db0e84a23d55ccdad2e115f Mon Sep 17 00:00:00 2001
From: Danny Wood <danwood76@gmail.com>
Date: Thu, 30 Jul 2020 08:42:45 +0100
Subject: [PATCH] a3xelte: commonise GPS config

Change-Id: I0182eb040742f3f6189476bc0f16bf6b25e76197
---
 configs/gps/gps.conf                          |  5 --
 configs/gps/gps.xml                           | 55 -------------------
 device.mk                                     |  5 --
 .../base/core/res/res/values/config.xml       |  6 --
 4 files changed, 71 deletions(-)
 delete mode 100644 configs/gps/gps.conf
 delete mode 100644 configs/gps/gps.xml

diff --git a/configs/gps/gps.conf b/configs/gps/gps.conf
deleted file mode 100644
index 44f655c..0000000
--- a/configs/gps/gps.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-NTP_SERVER=pool.ntp.org
-#XTRA_SERVER_1=https://gllto1.glpals.com/4day/v3/latest/lto2.dat
-#XTRA_SERVER_2=https://gllto2.glpals.com/4day/v3/latest/lto2.dat
-SUPL_HOST=supl.google.com
-SUPL_PORT=7275
diff --git a/configs/gps/gps.xml b/configs/gps/gps.xml
deleted file mode 100644
index d3ca789..0000000
--- a/configs/gps/gps.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/glconfig.xsd" >
-  <!--HAL Confguration  -->
-  <hal
-       PortName="/dev/ttySAC0"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/class/sec/gps/GPS_PWR_EN/value"
-       GpioDelayMs="250"
-       NvStorageDir="/data/system/gps/"
-
-       LogDirectory="/storage/emulated/0/gps/broadcom/storage"
-
-       LPmode="false"
-       CpColdStart="false"
-       CpGuardTimeSec="1"
-       ReAidingOnHotStart="false"
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplTlsCertPath="/system/bin/gps.cer"
-       SuplTlsEnable="false"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       SuplVersion="1"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="false"
-
-       LbsEnable="true"
-       LbsServer="BCMLS2.glpals.com"
-       HttpSyncLto="true"
-       LbsCellEnable="false"
-       LtoDir="/data/system/gps/"
-
-       IgnoreJniTime="true"
-       HulaEnable="false"
-       AssertEnabled="false"
-       DisablePglorNmeaCallback="true"
-   />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_GLLIO | LOG_RAWDATA | LOG_GLLAPI | LOG_NMEA"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_26MHZ_300PPB"
-       RfType="GL_RF_47520_BRCM_EXT_LNA"
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-  >
-  </gll>
-
-  <gll_features
-       EnableLowPowerPmm="true"
-  />
-
-</glgps>
diff --git a/device.mk b/device.mk
index c3809a6..b9f3176 100644
--- a/device.mk
+++ b/device.mk
@@ -40,11 +40,6 @@ PRODUCT_PACKAGES += \
     camera.universal7580 \
     Snap
 
-# GPS
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/gps/gps.conf:system/etc/gps.conf \
-    $(LOCAL_PATH)/configs/gps/gps.xml:system/etc/gps.xml
-
 # hardware/samsung/AdvancedDisplay (MDNIE)
 PRODUCT_PACKAGES += \
     AdvancedDisplay
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 962e8db..8d80807 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -212,12 +212,6 @@
      for different hardware and product builds. -->
     <string name="config_radio_access_family">GSM | WCDMA | LTE</string>
 
-     <!-- Values for GPS configuration -->
-     <string-array translatable="false" name="config_gpsParameters">
-        <item>XTRA_SERVER_1=https://glltos1.glpals.com/4day/v3/latest/lto2.dat</item>
-        <item>XTRA_SERVER_2=https://glltos2.glpals.com/4day/v3/latest/lto2.dat</item>
-     </string-array>
-
     <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
     <bool translatable="false" name="config_wifi_dual_band_support">false</bool>
 
-- 
2.20.1