| commit | 1d043484d409d4d18eaf13aa1086f51fcee73587 | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Fri Feb 26 21:27:47 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 26 21:27:47 2016 +0000 |
| tree | 0547116f10724ff337ef920ba7bee678c780f48b | |
| parent | 94da34a8fa20ea6717089d0fe5777bf9c55b76bb [diff] | |
| parent | 5c09ec17261fc2217009f72ec45c1f00df51ccde [diff] |
Merge "healthd: Correct the scaling factor for maxVoltage and maxCurrent." into nyc-dev
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 110ed03..ae84d1e 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp
@@ -39,7 +39,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 {