From b90601305409b4975a3dc732c58df3b35b216534 Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Thu, 27 Jul 2023 15:44:01 +0800
Subject: [PATCH] gps: sync gps configurations

Bug: 293381314
Test: confirm the configurations are correct
Change-Id: I70a4c67672ad0fe11b0c3255c86419013869c97a
---
 location/gps.xml      | 20 ++++++++++++++------
 location/gps_user.xml | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/location/gps.xml b/location/gps.xml
index 9eff69d..e2404a3 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,8 +49,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
@@ -66,27 +67,34 @@
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
-       MultiCarrLnaMask="L1_EXT_ON"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
        RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.5"
 
        WarmStandbyTimeout1Seconds="10"
        WarmStandbyTimeout2Seconds="15"
 
        EnableGnssPropagateInStandby="true"
 
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
+       RfPathLossDb_Ap="3.51"
+       RfPathLossDb_Cp="3.51"
+       RfPathLossDb_Ap_L5="4.01"
+       RfPathLossDb_Cp_L5="4.01"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
        EnableOnChipStopNotification="2"
        PowerMode="3"
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
+
+       EnableB1C="false"
+       EnableCoex="true"
   />
 
   <gll_features
        EnableNicAutoSwitch="true"
+       EnableNavic="true"
   />
 
 </glgps>
diff --git a/location/gps_user.xml b/location/gps_user.xml
index f769e93..015ea13 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -47,8 +48,8 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpGuardTimeSec="1"
-       CpLppGuardTimeSec="1"
+       CpGuardTimeSec="2"
+       CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
 
        AttributionAppPkgName="com.google.android.carrierlocation"
@@ -65,27 +66,34 @@
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
-       MultiCarrLnaMask="L1_EXT_ON"
+       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
        RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.5"
 
        WarmStandbyTimeout1Seconds="10"
        WarmStandbyTimeout2Seconds="15"
 
        EnableGnssPropagateInStandby="true"
 
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
+       RfPathLossDb_Ap="3.51"
+       RfPathLossDb_Cp="3.51"
+       RfPathLossDb_Ap_L5="4.01"
+       RfPathLossDb_Cp_L5="4.01"
        OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
 
        EnableOnChipStopNotification="0"
        PowerMode="3"
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
+
+       EnableB1C="false"
+       EnableCoex="true"
   />
 
   <gll_features
        EnableNicAutoSwitch="true"
+       EnableNavic="true"
   />
 
 </glgps>