Upgrading Walleye's thermal HAL version to 2.0.
Also increasing thermal-engine skin shutdown threshold to let the framework
shutdown gracefully (see b/119221890).
Bug: 118689758
Test: adb shell dumpsys hardware_properties
adb shell su 0 lshal debug android.hardware.thermal@2.0::IThermal/default
pts -m PtsThermalHalTestCases
vts -m VtsHalThermalV1_0Target
vts -m VtsHalThermalV2_0Target
Change-Id: I089c54c722089f12affae488c81c039405839b5e
Signed-off-by: Vincent Palomares <paillon@google.com>
diff --git a/device-walleye.mk b/device-walleye.mk
index 46d86c2..e1dec8d 100644
--- a/device-walleye.mk
+++ b/device-walleye.mk
@@ -37,3 +37,6 @@
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
persist.traced.enable=1
+# Thermal HAL
+PRODUCT_COPY_FILES += \
+ device/google/muskie/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
diff --git a/thermal-engine.conf b/thermal-engine.conf
index ef41dad..4e89521 100755
--- a/thermal-engine.conf
+++ b/thermal-engine.conf
@@ -72,8 +72,8 @@
algo_type monitor
sampling 1000
sensor back_therm
-thresholds 56000
-thresholds_clr 55000
+thresholds 58000
+thresholds_clr 57000
actions shutdown
action_info 1
diff --git a/thermal_info_config.json b/thermal_info_config.json
new file mode 100644
index 0000000..3fe5489
--- /dev/null
+++ b/thermal_info_config.json
@@ -0,0 +1,204 @@
+{
+ "Sensors":[
+ {
+ "Name":"tsens_tz_sensor1",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor2",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor4",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor3",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor7",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor8",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor9",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor10",
+ "Type":"CPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"tsens_tz_sensor13",
+ "Type":"GPU",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ 95.0,
+ "NAN",
+ "NAN",
+ 125.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"battery",
+ "Type":"BATTERY",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ 60.0
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.001
+ },
+ {
+ "Name":"usb_port_temp",
+ "Type":"USB_PORT",
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN"
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.1
+ },
+ {
+ "Name":"back_therm",
+ "Type":"SKIN",
+ "HotThreshold":[
+ "NAN",
+ 40.0,
+ 47.0,
+ 50.0,
+ 52.0,
+ 54.0,
+ 56.0
+ ],
+ "HotHysteresis":[
+ 0.0,
+ 2.0,
+ 2.0,
+ 2.0,
+ 2.0,
+ 2.0,
+ 2.0
+ ],
+ "VrThreshold":52.0,
+ "Multiplier":1.0,
+ "Monitor":true
+ }
+ ],
+ "CoolingDevices":[
+ {
+ "Name":"thermal-cpufreq-0",
+ "Type":"CPU"
+ },
+ {
+ "Name":"thermal-cpufreq-1",
+ "Type":"CPU"
+ }
+ ]
+}
