From 293906adffbef5383d647f3f226bf2c39f777bfd Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 29 Feb 2024 02:04:44 +0000 Subject: [PATCH] thermal: reading the thermistor temperature from upstream sysfs for proto Bug: 326252555 Test: adb shell dumpsys thermalservice Change-Id: I13dc61d5d4df64b3a9858dc062a3eee52d0dee94 --- thermal/thermal_info_config_caiman_proto.json | 8 -------- thermal/thermal_info_config_komodo_proto.json | 8 -------- thermal/thermal_info_config_tokay_proto.json | 8 -------- 3 files changed, 24 deletions(-) diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 2423f412..59ee53fe 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index 01113165..41c1a739 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index 839512dc..47d95a46 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000