commit a186e65368719a2f47b357be50d4ccf61501fe9b
author Todd Poynor <toddpoynor@google.com> Thu May 08 16:04:22 2014 -0700
committer Todd Poynor <toddpoynor@google.com> Fri May 16 03:05:11 2014 +0000
tree 61a99e0690fc09d0b457721553d3bfb487f18b8e
parent 37a5e7a21a018211b4502f80187a1dd23d71fd9f

BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties

Also fixup comments to match recent changes in BatteryManager.

Change-Id: I6f40924f9e66d564ad1175f9650e2bfd2ad39a3a

include/batteryservice/BatteryService.h

diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h
index 2902d17..6211cf4 100644
--- a/include/batteryservice/BatteryService.h
+++ b/include/batteryservice/BatteryService.h
@@ -18,6 +18,7 @@
 #define ANDROID_BATTERYSERVICE_H
 
 #include <binder/Parcel.h>
+#include <sys/types.h>
 #include <utils/Errors.h>
 #include <utils/String8.h>
 
@@ -45,10 +46,11 @@
 
 // must be kept in sync with definitions in BatteryProperty.java
 enum {
-    BATTERY_PROP_CHARGE_COUNTER = 1, // equals BatteryProperty.BATTERY_PROP_CHARGE_COUNTER constant
-    BATTERY_PROP_CURRENT_NOW = 2, // equals BatteryProperty.BATTERY_PROP_CURRENT_NOW constant
-    BATTERY_PROP_CURRENT_AVG = 3, // equals BatteryProperty.BATTERY_PROP_CURRENT_AVG constant
-    BATTERY_PROP_CAPACITY = 4, // equals BatteryProperty.BATTERY_PROP_CAPACITY constant
+    BATTERY_PROP_CHARGE_COUNTER = 1, // equals BatteryProperty.CHARGE_COUNTER constant
+    BATTERY_PROP_CURRENT_NOW = 2, // equals BatteryProperty.CURRENT_NOW constant
+    BATTERY_PROP_CURRENT_AVG = 3, // equals BatteryProperty.CURRENT_AVG constant
+    BATTERY_PROP_CAPACITY = 4, // equals BatteryProperty.CAPACITY constant
+    BATTERY_PROP_ENERGY_COUNTER = 5, // equals BatteryProperty.ENERGY_COUNTER constant
 };
 
 struct BatteryProperties {
@@ -68,7 +70,7 @@
 };
 
 struct BatteryProperty {
-    int valueInt;
+    int64_t valueInt64;
 
     status_t writeToParcel(Parcel* parcel) const;
     status_t readFromParcel(Parcel* parcel);