Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31e138db authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Show charging speed on Keyguard" into mnc-dr-dev

parents 82c4163e 687aa22c

include/batteryservice/BatteryService.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct BatteryProperties { 
    bool chargerAcOnline;

    bool chargerUsbOnline;

    bool chargerWirelessOnline;

    int maxChargingCurrent;

    int batteryStatus;

    int batteryHealth;

    bool batteryPresent;

services/batteryservice/BatteryProperties.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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);