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

Commit 6060e656 authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

Merge "batteryservice: Expose Charge Counters." into nyc-dev am: f99c6f4b 

am: 81db995a

* commit '81db995a':
  batteryservice: Expose Charge Counters.

Change-Id: I45b843ff2d6cdec0f1ebb9ef5c7cdc88c7b6a94e
parents 29be3abe 81db995a

include/batteryservice/BatteryService.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct BatteryProperties { 
    int batteryCurrent;

    int batteryCycleCount;

    int batteryFullCharge;

    int batteryChargeCounter;

    String8 batteryTechnology;



    status_t writeToParcel(Parcel* parcel) const;

services/batteryservice/BatteryProperties.cpp

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ status_t BatteryProperties::readFromParcel(Parcel* p) { 
    batteryLevel = p->readInt32();

    batteryVoltage = p->readInt32();

    batteryTemperature = p->readInt32();

    batteryChargeCounter = p->readInt32();

    batteryTechnology = String8((p->readString16()).string());

    return OK;

}
@@ -57,6 +58,7 @@ status_t BatteryProperties::writeToParcel(Parcel* p) const { 
    p->writeInt32(batteryLevel);

    p->writeInt32(batteryVoltage);

    p->writeInt32(batteryTemperature);

    p->writeInt32(batteryChargeCounter);

    p->writeString16(String16(batteryTechnology));

    return OK;

}