commit 4c5028f812408237b776e9ca7b3d1fc4fea6450c
author Xiang Wang <xwxw@google.com> Thu Mar 23 19:39:35 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 23 19:39:35 2023 +0000
tree 69b6fbf72d8fe68e858adeae45e3002cc7075312
parent c8ef3cff2045e805e896514f01513ac97cd875a8
parent 131a418398c7ac0677ebd805a8a0727e504cd73e

Merge "Migrate battery mitigation to Thermal AIDL" into udc-dev am: 131a418398

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/21996504

Change-Id: Ie79eb2450b3c7b685008e47d83dd5af8e99977bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

battery_mitigation/Android.bp

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

battery_mitigation/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 <battery_mitigation/BatteryMitigation.h>
+#include <android/binder_process.h>
 
 using android::hardware::google::pixel::BatteryMitigation;
 using android::hardware::google::pixel::MitigationConfig;
@@ -73,6 +74,8 @@
 
 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;