commit 4846c71b673719fdb569497a9a14d5235f0f2d2c
author Ruchi Kandoi <kandoiruchi@google.com> Fri Feb 26 21:29:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 26 21:29:48 2016 +0000
tree 5291ce4ade41902000ba69c05da8a584e635b4f3
parent 79958ece45ae2ade250a7d47912bc5da4213b75e
parent 3d769e40d52478758555db0b0e3219339f93dbfd

Merge "healthd: Correct the scaling factor for maxVoltage and maxCurrent." into nyc-dev
am: 1d043484d4

* commit '1d043484d409d4d18eaf13aa1086f51fcee73587':
  healthd: Correct the scaling factor for maxVoltage and maxCurrent.

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 9194314..8fb58dc 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -40,7 +40,7 @@
 #define FAKE_BATTERY_CAPACITY 42
 #define FAKE_BATTERY_TEMPERATURE 424
 #define ALWAYS_PLUGGED_CAPACITY 100
-#define MILLION 10000000.0
+#define MILLION 1.0e6
 #define DEFAULT_VBUS_VOLTAGE 5000000
 
 namespace android {