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

Commit a9028879 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Add support for USB_HVDCP chargers" 

am: ba3014c9

* commit 'ba3014c9':
  Add support for USB_HVDCP chargers
parents 046bf3b2 ba3014c9

healthd/BatteryMonitor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ BatteryMonitor::PowerSupplyType BatteryMonitor::readPowerSupplyType(const String 
            { "Mains", ANDROID_POWER_SUPPLY_TYPE_AC },

            { "USB", ANDROID_POWER_SUPPLY_TYPE_USB },

            { "USB_DCP", ANDROID_POWER_SUPPLY_TYPE_AC },

            { "USB_HVDCP", ANDROID_POWER_SUPPLY_TYPE_AC },

            { "USB_CDP", ANDROID_POWER_SUPPLY_TYPE_AC },

            { "USB_ACA", ANDROID_POWER_SUPPLY_TYPE_AC },

            { "USB_C", ANDROID_POWER_SUPPLY_TYPE_AC },
@@ -147,8 +148,10 @@ BatteryMonitor::PowerSupplyType BatteryMonitor::readPowerSupplyType(const String 
        return ANDROID_POWER_SUPPLY_TYPE_UNKNOWN;



    ret = (BatteryMonitor::PowerSupplyType)mapSysfsString(buf, supplyTypeMap);

    if (ret < 0)

    if (ret < 0) {

        KLOG_WARNING(LOG_TAG, "Unknown power supply type '%s'\n", buf);

        ret = ANDROID_POWER_SUPPLY_TYPE_UNKNOWN;

    }



    return ret;

}