commit 7014fbd7005e41514c7ff8411e3f655c910b611f
author Todd Poynor <toddpoynor@google.com> Fri Oct 04 14:03:27 2013 -0700
committer Todd Poynor <toddpoynor@google.com> Tue Oct 22 23:18:36 2013 +0000
tree c531fc73fc23fc241dccaea50d57ff8d5294fae7
parent 2130192c78d872e2c605648e6eadde8ff655463d

batteryservice: remove BatteryProperties fields not sent to BatteryService

Change-Id: I1116ebf0e21117fd37df7bfc41cb8ebaf9361faa

include/batteryservice/BatteryService.h

diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h
index a2530b6..689a7e6 100644
--- a/include/batteryservice/BatteryService.h
+++ b/include/batteryservice/BatteryService.h
@@ -59,8 +59,6 @@
     bool batteryPresent;
     int batteryLevel;
     int batteryVoltage;
-    int batteryCurrentNow;
-    int batteryChargeCounter;
     int batteryTemperature;
     String8 batteryTechnology;
 

services/batteryservice/BatteryProperties.cpp

diff --git a/services/batteryservice/BatteryProperties.cpp b/services/batteryservice/BatteryProperties.cpp
index e4a42ed..ab636a9 100644
--- a/services/batteryservice/BatteryProperties.cpp
+++ b/services/batteryservice/BatteryProperties.cpp
@@ -38,8 +38,6 @@
     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 @@
     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;