commit 577ea5663ab5df7ecfcc9abaa8fc3caa6a6beec4
author Yifan Hong <elsk@google.com> Wed Mar 02 19:41:59 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 02 19:41:59 2022 +0000
tree f0cc787090400d6fa6c4764e2b070915d25529cb
parent 96c8da665f2ae88725a1c10e42dd0000bac20fbf
parent e9cb1bedfd8dfa1b3627c5b521d4507eaf4583c3

Merge "health: batterymonitor uses AIDL HealthInfo." am: e9cb1bedfd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2004612

Change-Id: Ic95ccd4d9740774ad9d76491329b61b609874c4a

health/aidl/default/Health.cpp

diff --git a/health/aidl/default/Health.cpp b/health/aidl/default/Health.cpp
index e1d1982..d41d01a 100644
--- a/health/aidl/default/Health.cpp
+++ b/health/aidl/default/Health.cpp
@@ -130,12 +130,7 @@
 ndk::ScopedAStatus Health::getHealthInfo(HealthInfo* out) {
     battery_monitor_.updateValues();
 
-    // TODO(b/177269435): BatteryMonitor should store AIDL HealthInfo instead.
-    auto health_info_2_1 = battery_monitor_.getHealthInfo_2_1();
-    if (!::android::h2a::translate(health_info_2_1, out)) {
-        return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(
-                IHealth::STATUS_UNKNOWN, "Cannot translate HIDL HealthInfo to AIDL");
-    }
+    *out = battery_monitor_.getHealthInfo();
 
     // Fill in storage infos; these aren't retrieved by BatteryMonitor.
     if (auto res = getStorageInfo(&out->storageInfos); !res.isOk()) {