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

Commit 2cb36706 authored by David Anderson's avatar David Anderson
Browse files

fastboot: Add getvar commands to query battery part info. 

This adds two commands to test the new v3 Health HAL, to query the
battery serial number (unlocked devices only) and part status.

Bug: 309792384
Test: adb reboot fastboot
      fastboot getvar battery-part-status
      fastboot getvar battery-serial-number
Change-Id: Ie0a14eda06483d047544833124c327fb88ba43a2
parent 9305c988

fastboot/constants.h

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

#define FB_VAR_MAX_FETCH_SIZE "max-fetch-size"

#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 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_TREBLE_ENABLED, {GetTrebleEnabled, 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) {

fastboot/device/variables.cpp

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


    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 Diff line number Diff line
@@ -67,6 +67,10 @@ bool GetBatterySoC(FastbootDevice* device, const std::vector<std::string>& args, 
                   std::string* message);

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

                     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,

                           std::string* message);

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