From 356b40e60ca43bd9b9f20d12aac3f14a5d2bf2ad Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Tue, 29 Aug 2023 14:12:35 +0800
Subject: [PATCH] gps: set high accuracy shape mode and enable always-on
 measurements log

Bug: 277337710
Bug: 286158090
Test: verify pass in b/286158090#comment53 and b/277336756#comment32
Change-Id: I8280637e2db68dc1ad3cac3070eedf23ea1b5c83
---
 location/gps.xml          | 3 ++-
 location/gps.xml.c10      | 3 ++-
 location/gps.xml.p10      | 3 ++-
 location/gps_user.xml     | 1 +
 location/gps_user.xml.c10 | 1 +
 location/gps_user.xml.p10 | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/location/gps.xml b/location/gps.xml
index 39e9561..3e9b0df 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -58,6 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
@@ -69,7 +70,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index 6951905..26a55f7 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -58,6 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
@@ -69,7 +70,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index e99ee0a..0215c9e 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -58,6 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
@@ -69,7 +70,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 11e8a94..d85da72 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -57,6 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index cc2e139..1a369a6 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -57,6 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index 95211f6..c1e5d59 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -57,6 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"