diff options
| author | 2015-11-02 18:35:08 +0000 | |
|---|---|---|
| committer | 2015-11-02 18:35:08 +0000 | |
| commit | ead99f907bb0bd2d64d38702e2aaa4cfccca45f9 (patch) | |
| tree | 03ce069a2751c4354e96abeb8d937848504de287 | |
| parent | 54ddf8fc37034c303e50724d8feab9504fd50b13 (diff) | |
| parent | 06f511b469c7ba69d889cc5252e908f1084c8ff5 (diff) | |
Merge "batteryservice: Add max charging voltage"
| -rw-r--r-- | include/batteryservice/BatteryService.h | 1 | ||||
| -rw-r--r-- | services/batteryservice/BatteryProperties.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h index 9a8e2f7017..912dcf6672 100644 --- a/include/batteryservice/BatteryService.h +++ b/include/batteryservice/BatteryService.h @@ -58,6 +58,7 @@ struct BatteryProperties { bool chargerUsbOnline; bool chargerWirelessOnline; int maxChargingCurrent; + int maxChargingVoltage; int batteryStatus; int batteryHealth; bool batteryPresent; diff --git a/services/batteryservice/BatteryProperties.cpp b/services/batteryservice/BatteryProperties.cpp index f13d6e8b4c..07cc7971ce 100644 --- a/services/batteryservice/BatteryProperties.cpp +++ b/services/batteryservice/BatteryProperties.cpp @@ -34,6 +34,7 @@ status_t BatteryProperties::readFromParcel(Parcel* p) { 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 @@ status_t BatteryProperties::writeToParcel(Parcel* p) const { 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); |