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

Commit 347a9e7a authored by Ramakrishnan Ganesh's avatar Ramakrishnan Ganesh Committed by Linux Build Service Account
Browse files

healthd: Reinitialize mChargerNames for every battery update 

Booting up the device without usb, the kernel sets the usb power supply
type as UNKNOWN. The type of usb power supply changes at run-time as
various chargers are plugged in/out. However, healthd initilizes the
charger list only at bootup. Change it such that it checks for charger
type changes with every battery or usb uevent.

While at it, the kernel may have a power supply type which is not known
to healthd. This is perfectly fine. Update healthd to not print a
warning.

Change-Id: I2ec9f9a420ca61814d43c316b418ce94de3691bc
parent 4e22ea7d

healthd/BatteryMonitor.cpp

+53 −25
Original line number Diff line number Diff line
@@ -209,18 +209,37 @@ bool BatteryMonitor::update(void) { 
    if (readFromFile(mHealthdConfig->batteryTechnologyPath, buf, SIZE) > 0)

        props.batteryTechnology = String8(buf);



    unsigned int i;



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

    // reinitialize the mChargerNames vector everytime there is an update

    String8 path;

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

                          mChargerNames[i].string());

    DIR* dir = opendir(POWER_SUPPLY_SYSFS_PATH);

    if (dir == NULL) {

        KLOG_ERROR(LOG_TAG, "Could not open %s\n", POWER_SUPPLY_SYSFS_PATH);

    } else {

        struct dirent* entry;

        // reconstruct the charger strings

        mChargerNames.clear();

        while ((entry = readdir(dir))) {

            const char* name = entry->d_name;



            if (!strcmp(name, ".") || !strcmp(name, ".."))

                continue;



            // Look for "type" file in each subdirectory

            path.clear();

            path.appendFormat("%s/%s/type", POWER_SUPPLY_SYSFS_PATH, name);

            switch(readPowerSupplyType(path)) {

            case ANDROID_POWER_SUPPLY_TYPE_AC:

            case ANDROID_POWER_SUPPLY_TYPE_USB:

            case ANDROID_POWER_SUPPLY_TYPE_WIRELESS:

                path.clear();

                path.appendFormat("%s/%s/online", POWER_SUPPLY_SYSFS_PATH, name);

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

                    mChargerNames.add(String8(name));

                    if (readFromFile(path, buf, SIZE) > 0) {

                        if (buf[0] != '0') {

                            path.clear();

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

                                  mChargerNames[i].string());

                                              name);

                            switch(readPowerSupplyType(path)) {

                            case ANDROID_POWER_SUPPLY_TYPE_AC:

                                props.chargerAcOnline = true;
@@ -233,11 +252,20 @@ bool BatteryMonitor::update(void) { 
                                break;

                            default:

                                KLOG_WARNING(LOG_TAG, "%s: Unknown power supply type\n",

                                 mChargerNames[i].string());

                                             name);

                            }

                        }

                    }

                }

                break;

            case ANDROID_POWER_SUPPLY_TYPE_BATTERY:

                break;

            default:

                break;

            } //switch

        } //while

        closedir(dir);

    }//else



    logthis = !healthd_board_battery_update(&props);