From 687aa22c9281e37b7a8bd674bd2de183aebcc22b Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Fri, 10 Jul 2015 13:08:28 -0700 Subject: [PATCH] Show charging speed on Keyguard Bug: 8099739 Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36 --- include/batteryservice/BatteryService.h | 1 + services/batteryservice/BatteryProperties.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h index 6211cf4ca..f0a2790a9 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 ab636a9f8..f13d6e8b4 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);