tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support fastboot variable battery-soc-ok

Browse source 
Bug: 79480454
Test: fastboot getvar battery-soc-ok

Change-Id: Icfd70a71f1598e437316d4b8f895fd851516febb
Merged-In: Icfd70a71f1598e437316d4b8f895fd851516febb
(cherry picked from commit 9a1203b7ac)
This commit is contained in:
Hridya Valsaraju 2018-10-03 15:53:22 -07:00
parent d7f2c56089
commit a534a5a973
4 changed files with 61 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fastboot/constants.h
View file

@ -63,3 +63,4 @@
#define FB_VAR_VARIANT "variant"
#define FB_VAR_OFF_MODE_CHARGE_STATE "off-mode-charge"
#define FB_VAR_BATTERY_VOLTAGE "battery-voltage"
#define FB_VAR_BATTERY_SOC_OK "battery-soc-ok"

1
fastboot/device/commands.cpp
View file

@ -97,6 +97,7 @@ bool GetVarHandler(FastbootDevice* device, const std::vector<std::string>& args)
{FB_VAR_IS_USERSPACE, {GetIsUserspace, nullptr}},
{FB_VAR_OFF_MODE_CHARGE_STATE, {GetOffModeChargeState, nullptr}},
{FB_VAR_BATTERY_VOLTAGE, {GetBatteryVoltage, nullptr}},
{FB_VAR_BATTERY_SOC_OK, {GetBatterySoCOk, nullptr}},
{FB_VAR_HW_REVISION, {GetHardwareRevision, nullptr}}};
if (args.size() < 2) {

75
fastboot/device/variables.cpp
View file

@ -96,6 +96,56 @@ bool GetVariant(FastbootDevice* device, const std::vector<std::string>& /* args
return true;
}
bool GetBatteryVoltageHelper(FastbootDevice* device, int32_t* battery_voltage) {
using android::hardware::health::V2_0::HealthInfo;
using android::hardware::health::V2_0::Result;
auto health_hal = device->health_hal();
if (!health_hal) {
return false;
}
Result ret;
auto ret_val = health_hal->getHealthInfo([&](Result result, HealthInfo info) {
*battery_voltage = info.legacy.batteryVoltage;
ret = result;
});
if (!ret_val.isOk() || (ret != Result::SUCCESS)) {
return false;
}
return true;
}
bool GetBatterySoCOk(FastbootDevice* device, const std::vector<std::string>& /* args */,
std::string* message) {
int32_t battery_voltage = 0;
if (!GetBatteryVoltageHelper(device, &battery_voltage)) {
*message = "Unable to read battery voltage";
return false;
}
auto fastboot_hal = device->fastboot_hal();
if (!fastboot_hal) {
*message = "Fastboot HAL not found";
return false;
}
Result ret;
auto ret_val = fastboot_hal->getBatteryVoltageFlashingThreshold(
[&](int32_t voltage_threshold, Result result) {
*message = battery_voltage >= voltage_threshold ? "yes" : "no";
ret = result;
});
if (!ret_val.isOk() || ret.status != Status::SUCCESS) {
*message = "Unable to get battery voltage flashing threshold";
return false;
}
return true;
}
bool GetOffModeChargeState(FastbootDevice* device, const std::vector<std::string>& /* args */,
std::string* message) {
auto fastboot_hal = device->fastboot_hal();
@ -120,26 +170,13 @@ bool GetOffModeChargeState(FastbootDevice* device, const std::vector<std::string
bool GetBatteryVoltage(FastbootDevice* device, const std::vector<std::string>& /* args */,
std::string* message) {
using android::hardware::health::V2_0::HealthInfo;
using android::hardware::health::V2_0::Result;
auto health_hal = device->health_hal();
if (!health_hal) {
*message = "Health HAL not found";
return false;
int32_t battery_voltage = 0;
if (GetBatteryVoltageHelper(device, &battery_voltage)) {
*message = std::to_string(battery_voltage);
return true;
}
Result ret;
auto ret_val = health_hal->getHealthInfo([&](Result result, HealthInfo info) {
*message = std::to_string(info.legacy.batteryVoltage);
ret = result;
});
if (!ret_val.isOk() || (ret != Result::SUCCESS)) {
*message = "Unable to get battery voltage";
return false;
}
return true;
*message = "Unable to get battery voltage";
return false;
}
bool GetCurrentSlot(FastbootDevice* device, const std::vector<std::string>& /* args */,

3
fastboot/device/variables.h
View file

@ -57,6 +57,9 @@ bool GetOffModeChargeState(FastbootDevice* device, const std::vector<std::string
std::string* message);
bool GetBatteryVoltage(FastbootDevice* device, const std::vector<std::string>& args,
std::string* message);
bool GetBatterySoCOk(FastbootDevice* device, const std::vector<std::string>& args,
std::string* message);
// Helpers for getvar all.
std::vector<std::vector<std::string>> GetAllPartitionArgsWithSlot(FastbootDevice* device);
std::vector<std::vector<std::string>> GetAllPartitionArgsNoSlot(FastbootDevice* device);