summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ruchi Kandoi <kandoiruchi@google.com> 2015-08-26 00:22:12 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-26 00:22:12 +0000
commit2057e777b31b6904fd29eac562ee15526000902f (patch)
tree405c9b306074993231787569b480ecb79568eb52
parent05d902b7a377920354327125e680fa97eb8a13f8 (diff)
parentcf1fedef98db7a5ae30685cdc47b5b6e107fba50 (diff)
am cf1fedef: am 2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."
* commit 'cf1fedef98db7a5ae30685cdc47b5b6e107fba50': BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties.
-rw-r--r--include/batteryservice/BatteryService.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h
index 6211cf4cae..cf19add55e 100644
--- a/include/batteryservice/BatteryService.h
+++ b/include/batteryservice/BatteryService.h
@@ -63,6 +63,9 @@ struct BatteryProperties {
int batteryLevel;
int batteryVoltage;
int batteryTemperature;
+ int batteryCurrent;
+ int batteryCycleCount;
+ int batteryFullCharge;
String8 batteryTechnology;
status_t writeToParcel(Parcel* parcel) const;