commit c12a30762e3704810bf39b840b5c9bc033d9d00c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 11 01:55:30 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 11 01:55:30 2021 +0000
tree b8caac4829d1cc2a01c031574e6e4a3dc93f0c92
parent 0e48d9458d5cb8b599dbc12dc54eeb705c6ce803
parent 6deecc5ff90a57a62c24e8ff2e96c18ac325560a

Merge "health 2.1 impl: log values properly." am: 709382fcc5 am: 5fef7e1de0 am: 98a3f25f5c am: 6deecc5ff9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7aea61d82c4655685b6513163c70db252224981c

health/utils/libhealth2impl/Health.cpp

diff --git a/health/utils/libhealth2impl/Health.cpp b/health/utils/libhealth2impl/Health.cpp
index f4684ae..035b36f 100644
--- a/health/utils/libhealth2impl/Health.cpp
+++ b/health/utils/libhealth2impl/Health.cpp
@@ -80,14 +80,14 @@
 
 Return<Result> Health::update() {
     Result result = Result::UNKNOWN;
-    getHealthInfo_2_1([&](auto res, const auto& /* health_info */) {
+    getHealthInfo_2_1([&](auto res, const auto& health_info) {
         result = res;
         if (res != Result::SUCCESS) {
             LOG(ERROR) << "Cannot call getHealthInfo_2_1: " << toString(res);
             return;
         }
 
-        battery_monitor_.logValues();
+        BatteryMonitor::logValues(health_info, *healthd_config_);
     });
     return result;
 }