commit 7ae63ccdfd1a5dcb9b9abeac18c7ae10aa8d87ff
author Yifan Hong <elsk@google.com> Tue Oct 22 16:15:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 22 16:15:07 2019 -0700
tree 414b68fe512a0bb33d0f987477b38992ee376e33
parent 545aadb293035c725ae97691affd245e2f9b50c0
parent 7970a4ad289982e518f798e8d74be006bf576148

Merge "[REFACTOR] health 2.0: BatteryMonitor::update split into 3 funcs" am: 17fad82187
am: 7970a4ad28

Change-Id: Ief54d2cca6a54c3f065fc0c0b7663e39f56270b0

health/2.0/default/Health.cpp

diff --git a/health/2.0/default/Health.cpp b/health/2.0/default/Health.cpp
index a2b81d1..c0c5a40 100644
--- a/health/2.0/default/Health.cpp
+++ b/health/2.0/default/Health.cpp
@@ -148,7 +148,14 @@
 
     // Retrieve all information and call healthd_mode_ops->battery_update, which calls
     // notifyListeners.
-    bool chargerOnline = battery_monitor_->update();
+    battery_monitor_->updateValues();
+    struct BatteryProperties props = getBatteryProperties(battery_monitor_.get());
+    bool log = healthd_board_battery_update(&props);
+    if (log) {
+        battery_monitor_->logValues();
+    }
+    healthd_mode_ops->battery_update(&props);
+    bool chargerOnline = battery_monitor_->isChargerOnline();
 
     // adjust uevent / wakealarm periods
     healthd_battery_update_internal(chargerOnline);