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

Commit 8f132af4 authored by Todd Poynor's avatar Todd Poynor
Browse files

healthd: Add ENERGY_COUNTER property placeholder, and 64-bit properties 

Will add healthd HAL support for ENERGY_COUNTER, and support in some HALs,
in following CLs.

Change-Id: Ife2eaa30473be3a59183c6ce61fdaa61f32dd01b
parent e1d5247e

healthd/BatteryMonitor.cpp

+10 −7
Original line number Diff line number Diff line
@@ -271,10 +271,12 @@ bool BatteryMonitor::update(void) { 
status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) {

    status_t ret = BAD_VALUE;



    val->valueInt64 = LONG_MIN;



    switch(id) {

    case BATTERY_PROP_CHARGE_COUNTER:

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

            val->valueInt =

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryChargeCounterPath);

            ret = NO_ERROR;

        } else {
@@ -284,7 +286,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 


    case BATTERY_PROP_CURRENT_NOW:

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

            val->valueInt =

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryCurrentNowPath);

            ret = NO_ERROR;

        } else {
@@ -294,7 +296,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 


    case BATTERY_PROP_CURRENT_AVG:

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

            val->valueInt =

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryCurrentAvgPath);

            ret = NO_ERROR;

        } else {
@@ -304,7 +306,7 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 


    case BATTERY_PROP_CAPACITY:

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

            val->valueInt =

            val->valueInt64 =

                getIntField(mHealthdConfig->batteryCapacityPath);

            ret = NO_ERROR;

        } else {
@@ -312,13 +314,14 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) { 
        }

        break;



    case BATTERY_PROP_ENERGY_COUNTER:

        ret = NAME_NOT_FOUND;

        break;



    default:

        break;

    }



    if (ret != NO_ERROR)

        val->valueInt = INT_MIN;



    return ret;

}