From b98240cc6ca8fe60b93bfc0d2f6e49c66329f8ff Mon Sep 17 00:00:00 2001
From: Todd Poynor <toddpoynor@google.com>
Date: Tue, 30 Jul 2013 19:12:10 -0700
Subject: [PATCH] batteryservice: add battery current now and charge counter
 data

Change-Id: I4b3ea25342d4a03a8e38bfee2ef3b1ce54f82582
---
 include/batteryservice/BatteryService.h       | 2 ++
 services/batteryservice/BatteryProperties.cpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h
index 855262b33..829061a34 100644
--- a/include/batteryservice/BatteryService.h
+++ b/include/batteryservice/BatteryService.h
@@ -52,6 +52,8 @@ struct BatteryProperties {
     bool batteryPresent;
     int batteryLevel;
     int batteryVoltage;
+    int batteryCurrentNow;
+    int batteryChargeCounter;
     int batteryTemperature;
     String8 batteryTechnology;
 
diff --git a/services/batteryservice/BatteryProperties.cpp b/services/batteryservice/BatteryProperties.cpp
index ab636a9f8..e4a42edcd 100644
--- a/services/batteryservice/BatteryProperties.cpp
+++ b/services/batteryservice/BatteryProperties.cpp
@@ -38,6 +38,8 @@ status_t BatteryProperties::readFromParcel(Parcel* p) {
     batteryPresent = p->readInt32() == 1 ? true : false;
     batteryLevel = p->readInt32();
     batteryVoltage = p->readInt32();
+    batteryCurrentNow = p->readInt32();
+    batteryChargeCounter = p->readInt32();
     batteryTemperature = p->readInt32();
     batteryTechnology = String8((p->readString16()).string());
     return OK;
@@ -52,6 +54,8 @@ status_t BatteryProperties::writeToParcel(Parcel* p) const {
     p->writeInt32(batteryPresent ? 1 : 0);
     p->writeInt32(batteryLevel);
     p->writeInt32(batteryVoltage);
+    p->writeInt32(batteryCurrentNow);
+    p->writeInt32(batteryChargeCounter);
     p->writeInt32(batteryTemperature);
     p->writeString16(String16(batteryTechnology));
     return OK;