thermal: reading the thermistor temperature from upstream sysfs

tz_temp callback will invoke thermal_zone_device_update and return the cached temp from thermal core. However, during device resume, the cached temp may be reset to INVALID number before being returned.
So, change the reading path to upstream temp_show which will return the temperature from thermistor driver directly.

Bug: 326252555
Test: adb shell dumpsys thermalservice
Change-Id: I82cf81d940585c4827256804bc9c9397f4b54ccf
This commit is contained in:
TeYuan Wang 2024-02-28 00:54:21 +00:00 committed by Kame(TeYuan) Wang
parent 4269b04d39
commit f2a7aba99e
6 changed files with 0 additions and 48 deletions

View file

@ -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

View file

@ -5,7 +5,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 42.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", 43.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", 57.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", 58.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", 41.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", 54.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", 44.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", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000

View file

@ -5,7 +5,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 42.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", 43.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", 57.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", 58.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", 41.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", 54.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", 44.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", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000

View file

@ -5,7 +5,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 42.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":60000,
"PassiveDelay":7000
@ -15,7 +14,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 43.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":60000,
"PassiveDelay":7000
@ -25,7 +23,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 57.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":60000,
"PassiveDelay":7000
@ -35,7 +32,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 58.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":60000,
"PassiveDelay":7000
@ -45,7 +41,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 41.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":60000,
"PassiveDelay":7000
@ -61,7 +56,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 54.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":60000,
"PassiveDelay":7000
@ -71,7 +65,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 44.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":60000,
"PassiveDelay":7000
@ -80,7 +73,6 @@
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000

View file

@ -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

View file

@ -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