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

Commit 99a33df5 authored by David Anderson's avatar David Anderson Committed by Gerrit Code Review
Browse files

Merge changes from topic "health-v3" into main 

* changes:
  fastboot: Add getvar commands to query battery part info.
  Update fastbootd to use Health AIDL HAL V3.
  Update healthd to use Health AIDL HAL V3.
  Update storaged to use Health AIDL HAL V3.
parents 31481802 2cb36706

fastboot/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -170,7 +170,7 @@ cc_binary { 
        "android.hardware.fastboot@1.1",

        "android.hardware.fastboot@1.1",

        "android.hardware.fastboot-V1-ndk",

        "android.hardware.fastboot-V1-ndk",

        "android.hardware.health@2.0",

        "android.hardware.health@2.0",

        "android.hardware.health-V2-ndk",

        "android.hardware.health-V3-ndk",

        "libasyncio",

        "libasyncio",

        "libbase",

        "libbase",

        "libbinder_ndk",

        "libbinder_ndk",

fastboot/constants.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -82,3 +82,5 @@ 
#define FB_VAR_TREBLE_ENABLED "treble-enabled"

#define FB_VAR_TREBLE_ENABLED "treble-enabled"

#define FB_VAR_MAX_FETCH_SIZE "max-fetch-size"

#define FB_VAR_MAX_FETCH_SIZE "max-fetch-size"

#define FB_VAR_DMESG "dmesg"

#define FB_VAR_DMESG "dmesg"

#define FB_VAR_BATTERY_SERIAL_NUMBER "battery-serial-number"

#define FB_VAR_BATTERY_PART_STATUS "battery-part-status"

fastboot/device/commands.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -147,6 +147,8 @@ const std::unordered_map<std::string, VariableHandlers> kVariableMap = { 
        {FB_VAR_SECURITY_PATCH_LEVEL, {GetSecurityPatchLevel, nullptr}},

        {FB_VAR_SECURITY_PATCH_LEVEL, {GetSecurityPatchLevel, nullptr}},

        {FB_VAR_TREBLE_ENABLED, {GetTrebleEnabled, nullptr}},

        {FB_VAR_TREBLE_ENABLED, {GetTrebleEnabled, nullptr}},

        {FB_VAR_MAX_FETCH_SIZE, {GetMaxFetchSize, nullptr}},

        {FB_VAR_MAX_FETCH_SIZE, {GetMaxFetchSize, nullptr}},

        {FB_VAR_BATTERY_SERIAL_NUMBER, {GetBatterySerialNumber, nullptr}},

        {FB_VAR_BATTERY_PART_STATUS, {GetBatteryPartStatus, nullptr}},

};

};





static bool GetVarAll(FastbootDevice* device) {

static bool GetVarAll(FastbootDevice* device) {

fastboot/device/variables.cpp

+76 −0
Original line number Original line Diff line number Diff line
@@ -570,3 +570,79 @@ bool GetDmesg(FastbootDevice* device) { 




    return true;

    return true;

}

}



bool GetBatterySerialNumber(FastbootDevice* device, const std::vector<std::string>&,

                            std::string* message) {

    auto health_hal = device->health_hal();

    if (!health_hal) {

        return false;

    }



    if (GetDeviceLockStatus()) {

        return device->WriteFail("Device is locked");

    }



    *message = "unsupported";



    int32_t version = 0;

    auto res = health_hal->getInterfaceVersion(&version);

    if (!res.isOk()) {

        return device->WriteFail("Unable to query battery data");

    }

    if (version >= 3) {

        using aidl::android::hardware::health::BatteryHealthData;



        BatteryHealthData data;

        auto res = health_hal->getBatteryHealthData(&data);

        if (!res.isOk()) {

            return device->WriteFail("Unable to query battery data");

        }

        if (data.batterySerialNumber) {

            *message = *data.batterySerialNumber;

        }

    }

    return true;

}



bool GetBatteryPartStatus(FastbootDevice* device, const std::vector<std::string>&,

                          std::string* message) {

    auto health_hal = device->health_hal();

    if (!health_hal) {

        return false;

    }



    using aidl::android::hardware::health::BatteryPartStatus;



    BatteryPartStatus status = BatteryPartStatus::UNSUPPORTED;



    int32_t version = 0;

    auto res = health_hal->getInterfaceVersion(&version);

    if (!res.isOk()) {

        return device->WriteFail("Unable to query battery data");

    }

    if (version >= 3) {

        using aidl::android::hardware::health::BatteryHealthData;



        BatteryHealthData data;

        auto res = health_hal->getBatteryHealthData(&data);

        if (!res.isOk()) {

            return device->WriteFail("Unable to query battery data");

        }

        status = data.batteryPartStatus;

    }

    switch (status) {

        case BatteryPartStatus::UNSUPPORTED:

            *message = "unsupported";

            break;

        case BatteryPartStatus::ORIGINAL:

            *message = "original";

            break;

        case BatteryPartStatus::REPLACED:

            *message = "replaced";

            break;

        default:

            *message = "unknown";

            break;

    }

    return true;

}

fastboot/device/variables.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,10 @@ bool GetBatterySoC(FastbootDevice* device, const std::vector<std::string>& args, 
                   std::string* message);

                   std::string* message);

bool GetBatterySoCOk(FastbootDevice* device, const std::vector<std::string>& args,

bool GetBatterySoCOk(FastbootDevice* device, const std::vector<std::string>& args,

                     std::string* message);

                     std::string* message);

bool GetBatterySerialNumber(FastbootDevice* device, const std::vector<std::string>& args,

                            std::string* message);

bool GetBatteryPartStatus(FastbootDevice* device, const std::vector<std::string>& args,

                          std::string* message);

bool GetSuperPartitionName(FastbootDevice* device, const std::vector<std::string>& args,

bool GetSuperPartitionName(FastbootDevice* device, const std::vector<std::string>& args,

                           std::string* message);

                           std::string* message);

bool GetSnapshotUpdateStatus(FastbootDevice* device, const std::vector<std::string>& args,

bool GetSnapshotUpdateStatus(FastbootDevice* device, const std::vector<std::string>& args,