commit bee6e06bf4f060c48b44562cdb5e2ee1510b68f5
author Yifan Hong <elsk@google.com> Wed Apr 08 16:14:45 2020 -0700
committer Yifan Hong <elsk@google.com> Thu Apr 09 14:41:51 2020 -0700
tree 65cb777c6b8cee1900f4c88fb2fcf4c5391fdf4e
parent 158eaac83148e92524c02b69bc2d70778f10330f

BatteryMonitor: report current_now in uA

/sys/class/power_supply/*/current_now should return uA and the HAL
expects uA too.

Test: VtsHalHealthV2_0TargetTest
Bug: 136717180
Change-Id: I675be1ae645413b9494af4a5d49955aad5bd4f2e
(cherry picked from commit e5bd5f914f1bfdf94379ea0c2d72d58c06cfd25e)
Merged-In: I675be1ae645413b9494af4a5d49955aad5bd4f2e

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 8b67e22..599f500 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -258,7 +258,7 @@
     props.batteryVoltage = getIntField(mHealthdConfig->batteryVoltagePath) / 1000;
 
     if (!mHealthdConfig->batteryCurrentNowPath.isEmpty())
-        props.batteryCurrent = getIntField(mHealthdConfig->batteryCurrentNowPath) / 1000;
+        props.batteryCurrent = getIntField(mHealthdConfig->batteryCurrentNowPath);
 
     if (!mHealthdConfig->batteryFullChargePath.isEmpty())
         props.batteryFullCharge = getIntField(mHealthdConfig->batteryFullChargePath);