Merge remote-tracking branch 'origin/Bitra.LA.3.2.1-target' into fp4t-target-0414
diff --git a/android.hardware.thermal@2.0-service.qti.rc b/android.hardware.thermal@2.0-service.qti.rc
index 4c9186c..5c98ab4 100644
--- a/android.hardware.thermal@2.0-service.qti.rc
+++ b/android.hardware.thermal@2.0-service.qti.rc
@@ -25,6 +25,10 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Changes from Qualcomm Innovation Center are provided under the following license:
+# Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
service android.thermal-hal /vendor/bin/hw/android.hardware.thermal@2.0-service.qti
interface android.hardware.thermal@1.0::IThermal default
@@ -32,3 +36,6 @@
class hal
user root
group root
+
+on property:sys.boot_completed=1
+ restart android.thermal-hal
diff --git a/thermalConfig.cpp b/thermalConfig.cpp
index 0bbbc08..0da6f1e 100644
--- a/thermalConfig.cpp
+++ b/thermalConfig.cpp
@@ -229,7 +229,7 @@
},
{
TemperatureType::SKIN,
- { "quiet-therm-usr" },
+ { "pa-therm0-usr" },
"skin",
40000,
95000,
@@ -1079,6 +1079,7 @@
{475, sensor_cfg_yupik}, // yupik
{515, sensor_cfg_yupik}, // YUPIK-LTE
{486, sensor_cfg_monaco}, // monaco
+ {517, sensor_cfg_monaco}, // monaco
};
const std::unordered_map<int, std::vector<struct target_therm_cfg>>