tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "health: batterymonitor uses AIDL HealthInfo." am: e9cb1bedfd am: 577ea5663a am: 84a60fff99

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

Change-Id: Ic4841cf2375aed018557b776ff7344d8f0ff97a2
This commit is contained in:
Yifan Hong 2022-03-02 20:26:16 +00:00 committed by Automerger Merge Worker
commit ad4577c05e
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
health/aidl/default/Health.cpp
View file

@ -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()) {