From f060fe353c5890e02f9dba82825c0f009de48f13 Mon Sep 17 00:00:00 2001 From: Xiang Wang Date: Tue, 21 Feb 2023 15:14:42 -0800 Subject: [PATCH] Migrate battery mitigation to Thermal AIDL Bug: b/269163592 Test: Thermal AIDL service restart test + pmic file test Change-Id: I4922b0f7c6c2583143fcdd24e3039e17ced4a68b --- battery_mitigation/Android.bp | 4 ++-- battery_mitigation/battery_mitigation.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/battery_mitigation/Android.bp b/battery_mitigation/Android.bp index 3c0b882..c919de5 100644 --- a/battery_mitigation/Android.bp +++ b/battery_mitigation/Android.bp @@ -36,10 +36,10 @@ cc_binary { "libbinder_ndk", "libcutils", "libhardware", - "libhidlbase", "liblog", "libutils", - "android.hardware.thermal@2.0" + "android.hardware.thermal@2.0", + "android.hardware.thermal-V1-ndk" ], srcs: [ "battery_mitigation.cpp", diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index a7c1fd4..230f297 100644 --- a/battery_mitigation/battery_mitigation.cpp +++ b/battery_mitigation/battery_mitigation.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "battery-mitigation" #include +#include using android::hardware::google::pixel::BatteryMitigation; using android::hardware::google::pixel::MitigationConfig; @@ -73,6 +74,8 @@ const std::regex kTimestampRegex("^\\S+\\s[0-9]+:[0-9]+:[0-9]+\\S+$"); int main(int /*argc*/, char ** /*argv*/) { auto batteryMitigationStartTime = std::chrono::system_clock::now(); + ABinderProcess_setThreadPoolMaxThreadCount(1); + ABinderProcess_startThreadPool(); bmSp = new BatteryMitigation(cfg); if (!bmSp) { return 0;