commit 4e5a5adda807cec54df8c1f2ccf51830abe9b4e2
author Badhri Jagan Sridharan <Badhri@google.com> Tue Oct 27 13:37:05 2015 -0700
committer Rom Lemarchand <romlem@google.com> Mon Nov 16 10:29:14 2015 -0800
tree 372a5fc35773af5a7a299a6b68faeee003cbface
parent bc9bc0e0fc75097e48feff9bb954de648930817c

batteryservice: Add max charging voltage

Bug: 25229483
Change-Id: I4b6dd13870c41907c708f32412261efdca826023
(cherry picked from commit 06f511b469c7ba69d889cc5252e908f1084c8ff5)

include/batteryservice/BatteryService.h

diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h
index f0a2790..12d15ba 100644
--- a/include/batteryservice/BatteryService.h
+++ b/include/batteryservice/BatteryService.h
@@ -58,6 +58,7 @@
     bool chargerUsbOnline;
     bool chargerWirelessOnline;
     int maxChargingCurrent;
+    int maxChargingVoltage;
     int batteryStatus;
     int batteryHealth;
     bool batteryPresent;

services/batteryservice/BatteryProperties.cpp

diff --git a/services/batteryservice/BatteryProperties.cpp b/services/batteryservice/BatteryProperties.cpp
index f13d6e8..07cc797 100644
--- a/services/batteryservice/BatteryProperties.cpp
+++ b/services/batteryservice/BatteryProperties.cpp
@@ -34,6 +34,7 @@
     chargerUsbOnline = p->readInt32() == 1 ? true : false;
     chargerWirelessOnline = p->readInt32() == 1 ? true : false;
     maxChargingCurrent = p->readInt32();
+    maxChargingVoltage = p->readInt32();
     batteryStatus = p->readInt32();
     batteryHealth = p->readInt32();
     batteryPresent = p->readInt32() == 1 ? true : false;
@@ -49,6 +50,7 @@
     p->writeInt32(chargerUsbOnline ? 1 : 0);
     p->writeInt32(chargerWirelessOnline ? 1 : 0);
     p->writeInt32(maxChargingCurrent);
+    p->writeInt32(maxChargingVoltage);
     p->writeInt32(batteryStatus);
     p->writeInt32(batteryHealth);
     p->writeInt32(batteryPresent ? 1 : 0);