From 835341d69aa556462dbcd7509fe60a1006971ab5 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Tue, 12 Jul 2022 15:51:42 -0700 Subject: [PATCH 1/3] thermal: update usbc overheat mitigation thresholds Update usbc overheat mitigation thresholds for UI Bug: 222577017 Test: Build and boot on device Signed-off-by: Sayanna Chandula Change-Id: Ica73dfdb9795db09026822a0fee6048daacc439f --- thermal_info_config_cheetah.json | 2 +- thermal_info_config_panther.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 1c48f4c..1f89647 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -319,7 +319,7 @@ "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"], - "Coefficient":[43500, 2800, 6000], + "Coefficient":[43500, 3500, 8000], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "Multiplier":1, "Monitor":true, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 5e06475..0ea1598 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -319,7 +319,7 @@ "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"], - "Coefficient":[42000, 2000, 4000], + "Coefficient":[42000, 2500, 7000], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "Multiplier":1, "Monitor":true, From bb6bd73aabf626e4da80239099c81fd4d82157db Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Tue, 7 Jun 2022 22:25:38 -0700 Subject: [PATCH 2/3] thermal: update C10 vs-cpu-gpu thresholds Update C10 VIRTUAL-SKIN-CPU-GPU thresholds Bug: 230644885 Test: Build and boot on device. Signed-off-by: Sayanna Chandula Change-Id: I9316de24d69c3717e35d77c9318cc3a57389bb46 --- thermal_info_config_cheetah.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 1f89647..5a134bd 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -141,8 +141,8 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], "Coefficient":[1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, From 26d9dab173d263b64f36e61000d449eaa8033a37 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 20 Jul 2022 12:48:27 +0800 Subject: [PATCH 3/3] init: remove twoshay HAL init trigger condition 'on late-init' Bug: 238853979 Signed-off-by: Robin Peng Change-Id: I625c75f1e1f4d8c46bbe43e92e6311ddeb80788b --- conf/init.cheetah.rc | 2 +- conf/init.panther.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/init.cheetah.rc b/conf/init.cheetah.rc index c50741f..0d8010a 100644 --- a/conf/init.cheetah.rc +++ b/conf/init.cheetah.rc @@ -2,7 +2,7 @@ import /vendor/etc/init/hw/init.gs201.rc import /vendor/etc/init/hw/init.pantah.rc -on late-init && property:vendor.device.modules.ready=1 +on property:vendor.device.modules.ready=1 # Start the twoshay touch service start twoshay diff --git a/conf/init.panther.rc b/conf/init.panther.rc index 8d2bf97..d786cf3 100644 --- a/conf/init.panther.rc +++ b/conf/init.panther.rc @@ -2,7 +2,7 @@ import /vendor/etc/init/hw/init.gs201.rc import /vendor/etc/init/hw/init.pantah.rc -on late-init && property:vendor.device.modules.ready=1 +on property:vendor.device.modules.ready=1 # Start the twoshay touch service start twoshay