summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeYuan Wang <kamewang@google.com>2022-08-31 11:12:25 +0800
committerTeYuan Wang <kamewang@google.com>2022-09-01 09:52:11 +0800
commitbe6336211e0005f66116d08104ebd84f92ca4cf7 (patch)
tree60b6e805d526fb5af15f6b13572c43937872c3ee
parent65cac7e6ba30df98d34d74ccb2d54a76383d133b (diff)
thermal: fix racing when thermalHAL start
1. interface_start will bypass the "disabled" flag, so thermalHAL will be started before symlinks ready that cause trip point update unsuccessfully. 2. There has been policies to trigger symlink and thermalHAL service at "boot" stage, so we don't need hal class setting in rc. Bug: 244381248 Test: P22: confirm the trip points can be overwritten by thermalHAL successfully. Coral: thermal-engine and thermalHAL throttling work normally Change-Id: I61b29c7e3dfdfd2b118c277552fa731a395be479
-rw-r--r--thermal/android.hardware.thermal@2.0-service.pixel.rc4
-rw-r--r--thermal/pixel-thermal-symlinks.rc1
2 files changed, 1 insertions, 4 deletions
diff --git a/thermal/android.hardware.thermal@2.0-service.pixel.rc b/thermal/android.hardware.thermal@2.0-service.pixel.rc
index 0e23bef..3ed7865 100644
--- a/thermal/android.hardware.thermal@2.0-service.pixel.rc
+++ b/thermal/android.hardware.thermal@2.0-service.pixel.rc
@@ -4,11 +4,9 @@ on property:vendor.thermal.link_ready=1
trigger enable-thermal-hal
on enable-thermal-hal
- start vendor.thermal-hal-2-0
+ restart vendor.thermal-hal-2-0
service vendor.thermal-hal-2-0 /vendor/bin/hw/android.hardware.thermal@2.0-service.pixel
- interface android.hardware.thermal@1.0::IThermal default
- interface android.hardware.thermal@2.0::IThermal default
class hal
user system
group system
diff --git a/thermal/pixel-thermal-symlinks.rc b/thermal/pixel-thermal-symlinks.rc
index c42d7db..132ec5f 100644
--- a/thermal/pixel-thermal-symlinks.rc
+++ b/thermal/pixel-thermal-symlinks.rc
@@ -5,7 +5,6 @@ on boot
start vendor.thermal.symlinks
service vendor.thermal.symlinks /vendor/bin/thermal_symlinks
- class hal
user system
group system
oneshot