From 7014fbd7005e41514c7ff8411e3f655c910b611f Mon Sep 17 00:00:00 2001
From: Todd Poynor <toddpoynor@google.com>
Date: Fri, 4 Oct 2013 14:03:27 -0700
Subject: [PATCH] batteryservice: remove BatteryProperties fields not sent to
 BatteryService

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

diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h
index a2530b61e..689a7e645 100644
--- a/include/batteryservice/BatteryService.h
+++ b/include/batteryservice/BatteryService.h
@@ -59,8 +59,6 @@ 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 e4a42edcd..ab636a9f8 100644
--- a/services/batteryservice/BatteryProperties.cpp
+++ b/services/batteryservice/BatteryProperties.cpp
@@ -38,8 +38,6 @@ 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;
@@ -54,8 +52,6 @@ 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;