diff options
| author | 2015-07-14 19:17:00 +0000 | |
|---|---|---|
| committer | 2015-07-14 19:17:11 +0000 | |
| commit | 31e138db15b2460a0bb34d78f5b01d66cc8428f1 (patch) | |
| tree | d0e7d1644f0a9201d66c575bd84482cf2996d181 | |
| parent | 82c4163ef55e691a1706625ff83a776598f50492 (diff) | |
| parent | 687aa22c9281e37b7a8bd674bd2de183aebcc22b (diff) | |
Merge "Show charging speed on Keyguard" into mnc-dr-dev
| -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 6211cf4cae..f0a2790a93 100644 --- a/include/batteryservice/BatteryService.h +++ b/include/batteryservice/BatteryService.h @@ -57,6 +57,7 @@ struct BatteryProperties { bool chargerAcOnline; bool chargerUsbOnline; bool chargerWirelessOnline; + int maxChargingCurrent; int batteryStatus; int batteryHealth; bool batteryPresent; diff --git a/services/batteryservice/BatteryProperties.cpp b/services/batteryservice/BatteryProperties.cpp index ab636a9f8b..f13d6e8b4c 100644 --- a/services/batteryservice/BatteryProperties.cpp +++ b/services/batteryservice/BatteryProperties.cpp @@ -33,6 +33,7 @@ status_t BatteryProperties::readFromParcel(Parcel* p) { chargerAcOnline = p->readInt32() == 1 ? true : false; chargerUsbOnline = p->readInt32() == 1 ? true : false; chargerWirelessOnline = p->readInt32() == 1 ? true : false; + maxChargingCurrent = p->readInt32(); batteryStatus = p->readInt32(); batteryHealth = p->readInt32(); batteryPresent = p->readInt32() == 1 ? true : false; @@ -47,6 +48,7 @@ status_t BatteryProperties::writeToParcel(Parcel* p) const { p->writeInt32(chargerAcOnline ? 1 : 0); p->writeInt32(chargerUsbOnline ? 1 : 0); p->writeInt32(chargerWirelessOnline ? 1 : 0); + p->writeInt32(maxChargingCurrent); p->writeInt32(batteryStatus); p->writeInt32(batteryHealth); p->writeInt32(batteryPresent ? 1 : 0); |