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

Commit c764ed8f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BatteryMonitor: Add helper of logValues()" am: 23a13485 am: 257b978d am: 2a5b791a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1580979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie36a24e9a52a2a5bddc968578b018ec667d4a008
parents e43af091 2a5b791a

healthd/BatteryMonitor.cpp

+9 −4
Original line number Diff line number Diff line
@@ -349,9 +349,14 @@ void BatteryMonitor::updateValues(void) { 
}



void BatteryMonitor::logValues(void) {

    logValues(*mHealthInfo, *mHealthdConfig);

}



void BatteryMonitor::logValues(const android::hardware::health::V2_1::HealthInfo& health_info,

                               const struct healthd_config& healthd_config) {

    char dmesgline[256];

    size_t len;

    const HealthInfo_1_0& props = mHealthInfo->legacy.legacy;

    const HealthInfo_1_0& props = health_info.legacy.legacy;

    if (props.batteryPresent) {

        snprintf(dmesgline, sizeof(dmesgline), "battery l=%d v=%d t=%s%d.%d h=%d st=%d",

                 props.batteryLevel, props.batteryVoltage, props.batteryTemperature < 0 ? "-" : "",
@@ -359,17 +364,17 @@ void BatteryMonitor::logValues(void) { 
                 props.batteryHealth, props.batteryStatus);



        len = strlen(dmesgline);

        if (!mHealthdConfig->batteryCurrentNowPath.isEmpty()) {

        if (!healthd_config.batteryCurrentNowPath.isEmpty()) {

            len += snprintf(dmesgline + len, sizeof(dmesgline) - len, " c=%d",

                            props.batteryCurrent);

        }



        if (!mHealthdConfig->batteryFullChargePath.isEmpty()) {

        if (!healthd_config.batteryFullChargePath.isEmpty()) {

            len += snprintf(dmesgline + len, sizeof(dmesgline) - len, " fc=%d",

                            props.batteryFullCharge);

        }



        if (!mHealthdConfig->batteryCycleCountPath.isEmpty()) {

        if (!healthd_config.batteryCycleCountPath.isEmpty()) {

            len += snprintf(dmesgline + len, sizeof(dmesgline) - len, " cc=%d",

                            props.batteryCycleCount);

        }

healthd/include/healthd/BatteryMonitor.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ class BatteryMonitor { 
    void logValues(void);

    bool isChargerOnline();



    static void logValues(const android::hardware::health::V2_1::HealthInfo& health_info,

                          const struct healthd_config& healthd_config);



  private:

    struct healthd_config *mHealthdConfig;

    Vector<String8> mChargerNames;