commit be17a4f23529da0b769b745e3296e4e4e5ef06c5
author Yifan Hong <elsk@google.com> Wed Oct 11 10:40:56 2017 -0700
committer Yifan Hong <elsk@google.com> Wed Oct 11 10:53:37 2017 -0700
tree e3465eb3b50150c389d1a02bd06411a50a0ba70f
parent faaed165481ef3f7fa3392cd640d3ac7ffbcaacb

Update for expanding @2.0::HealthInfo.

Health service also sends other fields in callbacks.
Test: builds
Bug: 62229583

Change-Id: Icb9215c263ba34055e77db3dbb047998bb2da4e8

healthd/Health.cpp

diff --git a/healthd/Health.cpp b/healthd/Health.cpp
index 74f3eec..ec05398 100644
--- a/healthd/Health.cpp
+++ b/healthd/Health.cpp
@@ -120,7 +120,7 @@
     }
 
     // Retrieve all information and call healthd_mode_ops->battery_update, which calls
-    // notifyListeners.
+    // updateAndNotify.
     bool chargerOnline = battery_monitor_->update();
 
     // adjust uevent / wakealarm periods
@@ -129,10 +129,19 @@
     return Result::SUCCESS;
 }
 
-void Health::notifyListeners(const HealthInfo& info) {
+void Health::updateAndNotify(HealthInfo* info) {
+    // update 2.0 specific fields
+    struct BatteryProperty prop;
+    if (battery_monitor_->getProperty(BATTERY_PROP_CURRENT_AVG, &prop) == OK)
+        info->batteryCurrentAverage = static_cast<int32_t>(prop.valueInt64);
+    if (battery_monitor_->getProperty(BATTERY_PROP_CAPACITY, &prop) == OK)
+        info->batteryCapacity = static_cast<int32_t>(prop.valueInt64);
+    if (battery_monitor_->getProperty(BATTERY_PROP_ENERGY_COUNTER, &prop) == OK)
+        info->energyCounter = prop.valueInt64;
+
     std::lock_guard<std::mutex> _lock(callbacks_lock_);
     for (auto it = callbacks_.begin(); it != callbacks_.end();) {
-        auto ret = (*it)->healthInfoChanged(info);
+        auto ret = (*it)->healthInfoChanged(*info);
         if (!ret.isOk() && ret.isDeadObject()) {
             it = callbacks_.erase(it);
         } else {