From aa1d5b06b88fc8ce126ace7121b768a4acf02907 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Wed, 27 Mar 2024 12:06:23 +0800 Subject: [PATCH 1/3] audio: remove non-supported analog headset Bug: 329470379 Change-Id: I9bd4df130c2da60ba49f7c79d8c50070dba6b877 Signed-off-by: vincenttew --- audio/comet/config/audio_policy_configuration.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/audio/comet/config/audio_policy_configuration.xml b/audio/comet/config/audio_policy_configuration.xml index d02ee59..ff656e5 100644 --- a/audio/comet/config/audio_policy_configuration.xml +++ b/audio/comet/config/audio_policy_configuration.xml @@ -134,10 +134,6 @@ - - - - @@ -157,8 +153,6 @@ - - Date: Wed, 27 Mar 2024 09:28:12 +0800 Subject: [PATCH 2/3] gps: Update FW 4.15.0.154 + config change. - Add partial reset config control (default disable) - Add GlueLayer_IsUseCustomGnssLib support (default remove) - Add L5 Path Delay Parameters Bug: 329176689 Bug: 323089817 Bug: 296352970 Test: VTS/CTS, basic sanity, SST and Field test Change-Id: I7171431bd432a975e0e6674e8af91579583fd6fb --- location/user/gps.cfg | 7 +++++++ location/userdebug/gps.cfg | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 0942852..db6022c 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -53,12 +53,19 @@ UP_LocTech_Constraints=1 UP_LocTech_Requirements=0 SpotLogger_Allowed=0 soft_dog=0 + +path_delay_glo_12fx_cm=-5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455 +path_delay_gps_2fx_cm=12342 +path_delay_bds_4fx_cm=123 +path_delay_l5_20fx_cm=105916 + RfPathLossDb_Ap=3600 RfPathLossDb_Cp=3600 RfPathLossDb_L5_Ap=4300 RfPathLossDb_L5_Cp=4300 IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 +cp_partial_reset_disable=1 isUseUncalAccel=1 GNSS_CARRIER_CONFIG_BEGIN diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 859803f..a9d2050 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -178,6 +178,11 @@ SpotLogger_Allowed=0 soft_dog=0 +path_delay_glo_12fx_cm=-5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455 +path_delay_gps_2fx_cm=12342 +path_delay_bds_4fx_cm=123 +path_delay_l5_20fx_cm=105916 + RfPathLossDb_Ap=3600 RfPathLossDb_Cp=3600 RfPathLossDb_L5_Ap=4300 @@ -189,6 +194,12 @@ IsUseEntireRespTime911=1 # force engine to engage high accuracy if entire response time used; default 0 isForceHighAccuracyMode=1 +# This is to indicate if AP supports CP partial reset feature +# default = CP partial reset feature enabled +# 0 = CP partial reset feature enabled +# 1 = CP partial reset feature disabled +cp_partial_reset_disable=1 + # 0: Use calibrated Accel data 1: Use uncalibrated Accel data isUseUncalAccel=1 From 2d2f84936d23d19d0602081917180200404d1754 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Mon, 1 Apr 2024 12:23:17 +0800 Subject: [PATCH 3/3] thermal: Remove deprecated power rails Remove the below power rails as they're going to be replaced with different ones for better ODPM coverage. - S8S_VDD_G3D_L2 - L9S_GNSS_CORE Bug: 331556280 Test: Push config and verify thermal logs Change-Id: Ic5c6cb7c4ddae258c89cbe3cb50a104f7044e016 --- thermal/thermal_info_config_backup_comet.json | 5 +---- thermal/thermal_info_config_charge_comet.json | 5 +---- thermal/thermal_info_config_comet.json | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/thermal/thermal_info_config_backup_comet.json b/thermal/thermal_info_config_backup_comet.json index 04f9013..9b57ff9 100644 --- a/thermal/thermal_info_config_backup_comet.json +++ b/thermal/thermal_info_config_backup_comet.json @@ -354,10 +354,8 @@ "S1S_VDD_CAM", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", - "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", - "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", @@ -369,8 +367,7 @@ "VSYS_PWR_MODEM" ], "Coefficient": [ - 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 1.0 + 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ], "PowerSampleDelay": 7000, "PowerSampleCount": 5 diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json index c2dfdb9..d248325 100644 --- a/thermal/thermal_info_config_charge_comet.json +++ b/thermal/thermal_info_config_charge_comet.json @@ -325,10 +325,8 @@ "S1S_VDD_CAM", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", - "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", - "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", @@ -340,8 +338,7 @@ "VSYS_PWR_MODEM" ], "Coefficient": [ - 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 1.0 + 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 ], "PowerSampleDelay": 7000, "PowerSampleCount": 5 diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index bbbbd30..8b33b72 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -1025,10 +1025,8 @@ "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", - "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", - "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", @@ -1044,7 +1042,7 @@ ], "Coefficient": [ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, - 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 + 1.0, 1.0, 1.0, 1.0 ], "PowerSampleDelay": 7000, "PowerSampleCount": 5