Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad4577c0 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "health: batterymonitor uses AIDL HealthInfo." am: e9cb1bed am: 577ea566 am: 84a60fff 

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

Change-Id: Ic4841cf2375aed018557b776ff7344d8f0ff97a2
parents d0625cc3 84a60fff

health/aidl/default/Health.cpp

+1 −6
Original line number Diff line number Diff line
@@ -130,12 +130,7 @@ ndk::ScopedAStatus Health::getStorageInfo(std::vector<StorageInfo>*) { 
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()) {