commit 44a82fd7f91283c6e03d9302459438ab5712f8c6
author Yifan Hong <elsk@google.com> Mon Oct 28 21:37:59 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 21:37:59 2019 -0700
tree 6a80c8d46f0204eddf7c6c16989fd5d25eaf73c3
parent 4f36352dca78bac8702bdc774e83e69d106fc090
parent d37b66b054cf0a2a244f39a34e23e26ae97d9605

Merge changes from topic "batt_mon_2_1_types" am: a1015599d3 am: 38ea0a061d am: d8a7c8a62e
am: 7bef6c86d3

Change-Id: I60c83cf4ebf829ede96abcb22ad94af1bf891260

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index cdc2e5d..9e168e9 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -54,6 +54,7 @@
 using HealthInfo_2_1 = android::hardware::health::V2_1::HealthInfo;
 using android::hardware::health::V1_0::BatteryHealth;
 using android::hardware::health::V1_0::BatteryStatus;
+using android::hardware::health::V2_1::BatteryCapacityLevel;
 
 namespace android {
 
@@ -223,6 +224,15 @@
     if (!mHealthdConfig->batteryChargeCounterPath.isEmpty())
         props.batteryChargeCounter = getIntField(mHealthdConfig->batteryChargeCounterPath);
 
+    if (!mHealthdConfig->batteryCurrentAvgPath.isEmpty())
+        mHealthInfo->legacy.batteryCurrentAverage =
+                getIntField(mHealthdConfig->batteryCurrentAvgPath);
+
+    // TODO(b/142260281): Retrieve these values correctly.
+    mHealthInfo->batteryCapacityLevel = BatteryCapacityLevel::UNKNOWN;
+    mHealthInfo->batteryChargeTimeToFullNowSeconds = 0;
+    mHealthInfo->batteryFullCapacityUah = props.batteryFullCharge;
+
     props.batteryTemperature = mBatteryFixedTemperature ?
         mBatteryFixedTemperature :
         getIntField(mHealthdConfig->batteryTemperaturePath);