commit 7d3180a12cd45d7fb32182a27c6947f57f378e46
author Yifan Hong <elsk@google.com> Fri Dec 10 06:27:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 10 06:27:10 2021 +0000
tree ec190d43539854e692f73203162d76fd10490ff5
parent a5f3a4ae66d3147c5733736f77f8bc0370311047
parent 0ae6700b6b9cc6f8934df113ea29ec69146d6a89

Merge "Fix usage to health HIDL HAL." am: 0ae6700b6b

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1915758

Change-Id: I7c8b347b2e26906fc69b9bbf560ca474ceeba2c8

src/android_internal/health_hal.cc

diff --git a/src/android_internal/health_hal.cc b/src/android_internal/health_hal.cc
index 0d8ad05..194cb73 100644
--- a/src/android_internal/health_hal.cc
+++ b/src/android_internal/health_hal.cc
@@ -22,6 +22,7 @@
 namespace perfetto {
 namespace android_internal {
 
+using ::android::hardware::Return;
 using ::android::hardware::health::V2_0::IHealth;
 using ::android::hardware::health::V2_0::Result;
 
@@ -48,35 +49,37 @@
   // in the same thread.
   // See https://source.android.com/devices/architecture/hidl/threading .
 
-  Result res;
+  Return<void> ret;
+  Result res = Result::UNKNOWN;
   switch (counter) {
     case BatteryCounter::kUnspecified:
-      res = Result::NOT_FOUND;
       break;
 
     case BatteryCounter::kCharge:
-      g_svc->getChargeCounter([&res, value](Result hal_res, int32_t hal_value) {
-        res = hal_res;
-        *value = hal_value;
-      });
+      ret = g_svc->getChargeCounter(
+          [&res, value](Result hal_res, int32_t hal_value) {
+            res = hal_res;
+            *value = hal_value;
+          });
       break;
 
     case BatteryCounter::kCapacityPercent:
-      g_svc->getCapacity([&res, value](Result hal_res, int64_t hal_value) {
+      ret = g_svc->getCapacity([&res, value](Result hal_res, int32_t hal_value) {
         res = hal_res;
         *value = hal_value;
       });
       break;
 
     case BatteryCounter::kCurrent:
-      g_svc->getCurrentNow([&res, value](Result hal_res, int32_t hal_value) {
-        res = hal_res;
-        *value = hal_value;
-      });
+      ret =
+          g_svc->getCurrentNow([&res, value](Result hal_res, int32_t hal_value) {
+            res = hal_res;
+            *value = hal_value;
+          });
       break;
 
     case BatteryCounter::kCurrentAvg:
-      g_svc->getCurrentAverage(
+      ret = g_svc->getCurrentAverage(
           [&res, value](Result hal_res, int32_t hal_value) {
             res = hal_res;
             *value = hal_value;
@@ -84,10 +87,10 @@
       break;
   }  // switch(counter)
 
-  if (res == Result::CALLBACK_DIED)
+  if (ret.isDeadObject())
     g_svc.clear();
 
-  return res == Result::SUCCESS;
+  return ret.isOk() && res == Result::SUCCESS;
 }
 
 }  // namespace android_internal