From ba33d38d93ffaea0176ae53fd0c6c1ff98361f63 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Thu, 21 Nov 2024 13:00:12 +0800
Subject: [PATCH] gps: official release 4.15.1_34_241122_R4_246913

Bug: 377977207
Bug: 374650892

Test: b/380171873
atest CtsLocationGnssTestCases
atest VtsHalGnssTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e2330072ba03d3682a791cb5e0f3b6065834cb8)
Merged-In: I0ff60b2f495c12278ff1d3e4c4227795f55c1b0a
Change-Id: I0ff60b2f495c12278ff1d3e4c4227795f55c1b0a
---
 location/gps.cfg      | 15 ++-------------
 location/gps_user.cfg | 12 +-----------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/location/gps.cfg b/location/gps.cfg
index 1b303d9..aecc762 100644
--- a/location/gps.cfg
+++ b/location/gps.cfg
@@ -37,7 +37,8 @@ Is1PPSTimeSyncEnable=1
 Chip_Configuration_Dynamic_HSI=0
 
 # Set UBSAN to operate on logging mode on FW
-Chip_Configuration_ubsan_opt=1
+# 0: disable 1: crash mode 2: logging mode
+Chip_Configuration_ubsan_opt=2
 
 # borrow this field to force CP crash on GAL bad ISM
 #Chip_Configuration_WT1=1
@@ -199,18 +200,6 @@ RfPathLossDb_Ap=3800
 RfPathLossDb_Cp=3800
 NmeaBitmask=0x010003fff
 
-# GNSS power values in "mW"
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
-
 # force engine to use entire response time for emergency session; default 0
 IsUseEntireRespTime911=1
 # force engine to engage high accuracy if entire response time used; default 0
diff --git a/location/gps_user.cfg b/location/gps_user.cfg
index 94ac424..f0d41ab 100644
--- a/location/gps_user.cfg
+++ b/location/gps_user.cfg
@@ -13,7 +13,7 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin
 ChipCfg_Timemark_Option=1
 Is1PPSTimeSyncEnable=1
 Chip_Configuration_Dynamic_HSI=0
-Chip_Configuration_ubsan_opt=1
+Chip_Configuration_ubsan_opt=2
 GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
 chpp_log_level=0
@@ -76,16 +76,6 @@ SpotLogger_Allowed=0
 RfPathLossDb_Ap=3800
 RfPathLossDb_Cp=3800
 NmeaBitmask=0x010003fff
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 isUseUncalAccel=1