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

Commit c911044f authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Rom Lemarchand
Browse files

healthd: Read the max power supply voltage 

With Type-C PD, VBUS can no longer be assumed to
to be at 5V. Read the "voltage_max" field from the
power_supply class node and export it through
BatteryProperties service.

Bug: 25229483
Change-Id: I04e32d9783a21bab375f1724758a9eeace2a047c
(cherry picked from commit 42d9133a)
parent d2bbe457

healthd/BatteryMonitor.cpp

+24 −7
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#define FAKE_BATTERY_CAPACITY 42

#define FAKE_BATTERY_TEMPERATURE 424

#define ALWAYS_PLUGGED_CAPACITY 100

#define MILLION 10000000.0

#define DEFAULT_VBUS_VOLTAGE 5000000



namespace android {
@@ -185,6 +187,7 @@ bool BatteryMonitor::update(void) { 
    props.batteryStatus = BATTERY_STATUS_UNKNOWN;

    props.batteryHealth = BATTERY_HEALTH_UNKNOWN;

    props.maxChargingCurrent = 0;

    props.maxChargingVoltage = 0;



    if (!mHealthdConfig->batteryPresentPath.isEmpty())

        props.batteryPresent = getBooleanField(mHealthdConfig->batteryPresentPath);
@@ -223,6 +226,7 @@ bool BatteryMonitor::update(void) { 
        props.batteryTechnology = String8(buf);



    unsigned int i;

    double MaxPower = 0;



    for (i = 0; i < mChargerNames.size(); i++) {

        String8 path;
@@ -251,11 +255,23 @@ bool BatteryMonitor::update(void) { 
                path.clear();

                path.appendFormat("%s/%s/current_max", POWER_SUPPLY_SYSFS_PATH,

                                  mChargerNames[i].string());

                if (access(path.string(), R_OK) == 0) {

                    int maxChargingCurrent = getIntField(path);

                    if (props.maxChargingCurrent < maxChargingCurrent) {

                        props.maxChargingCurrent = maxChargingCurrent;

                    }

                int ChargingCurrent =

                    (access(path.string(), R_OK) == 0) ? getIntField(path) : 0;



                path.clear();

                path.appendFormat("%s/%s/voltage_max", POWER_SUPPLY_SYSFS_PATH,

                                  mChargerNames[i].string());



                int ChargingVoltage =

                    (access(path.string(), R_OK) == 0) ? getIntField(path) :

                    DEFAULT_VBUS_VOLTAGE;



                double power = ((double)ChargingCurrent / MILLION) *

                        ((double)ChargingVoltage / MILLION);

                if (MaxPower < power) {

                    props.maxChargingCurrent = ChargingCurrent;

                    props.maxChargingVoltage = ChargingVoltage;

                    MaxPower = power;

                }

            }

        }
@@ -385,9 +401,10 @@ void BatteryMonitor::dumpState(int fd) { 
    int v;

    char vs[128];



    snprintf(vs, sizeof(vs), "ac: %d usb: %d wireless: %d current_max: %d\n",

    snprintf(vs, sizeof(vs), "ac: %d usb: %d wireless: %d current_max: %d voltage_max: %d\n",

             props.chargerAcOnline, props.chargerUsbOnline,

             props.chargerWirelessOnline, props.maxChargingCurrent);

             props.chargerWirelessOnline, props.maxChargingCurrent,

             props.maxChargingVoltage);

    write(fd, vs, strlen(vs));

    snprintf(vs, sizeof(vs), "status: %d health: %d present: %d\n",

             props.batteryStatus, props.batteryHealth, props.batteryPresent);