commit b24247527ca0d5e9852f6d9050f7c2b84c0cf9a2
author Yingjie Wang <yingjiewang@codeaurora.org> Fri Mar 13 13:29:00 2020 +0800
committer Wayne Lin <waynewhlin@google.com> Mon Aug 10 09:09:37 2020 +0000
tree 42ce0b0b5cebe6f03f911ba4f7af855261105608
parent a3ae3ecb0e049682866e7356f238d060b9b15aba

Re-init battery listener when Health hal died

When system_server and health hal both died, battery listener
will get blocked in serviceDied. Make complete cleanup
for re-init.

Bug: 159429172
Test: build pass, basic function pass
Change-Id: I7ecc5b2e6e2aeb1e79ed45db94b05662eb9f37b9
CRs-fixed: 2640795

android/utils/battery_listener.cpp

diff --git a/android/utils/battery_listener.cpp b/android/utils/battery_listener.cpp
index e9aa5d5..6f553b6 100644
--- a/android/utils/battery_listener.cpp
+++ b/android/utils/battery_listener.cpp
@@ -187,7 +187,7 @@
     {
         std::lock_guard<std::mutex> _l(mLock);
         if (mHealth != NULL)
-            mHealth->unlinkToDeath(this);
+            mHealth->unregisterCallback(this);
             auto r = mHealth->unlinkToDeath(this);
             if (!r.isOk() || r == false) {
                 LOC_LOGe("Transaction error in unregister to HealthHAL death: %s",
@@ -210,6 +210,8 @@
         LOC_LOGi("health service died, reinit");
         mDone = true;
     }
+    mHealth = NULL;
+    mCond.notify_one();
     mThread->join();
     std::lock_guard<std::mutex> _l(mLock);
     init();