sky: healthd-ext: Fix charge_counter and ETA values

Based on 137843ec4f

Co-authored-by: Adithya R <gh0strider.2k18.reborn@gmail.com>
Change-Id: I3d000d283302a84ee9fcbd5a85ef26817b68c0a7
This commit is contained in:
Fabian Leutenegger
2023-09-20 13:41:37 +02:00
committed by redducc
parent b9ba4af581
commit 3f2190f9f6

View File

@@ -27,6 +27,31 @@ class ChargerCallbackImpl : public ChargerCallback {
} //namespace aidl::android::hardware::health
#endif
namespace aidl::android::hardware::health {
static constexpr int kChargeCounterMultiplier = 1000; // mAh to uAh
static constexpr int kChargeTimeToFullMultiplier = 60; // mins to secs
class HealthImpl : public Health {
public:
using Health::Health;
virtual ~HealthImpl() {}
ndk::ScopedAStatus getChargeCounterUah(int32_t* out) override;
protected:
void UpdateHealthInfo(HealthInfo* health_info) override;
};
void HealthImpl::UpdateHealthInfo(HealthInfo* health_info) {
if (health_info->batteryChargeTimeToFullNowSeconds == 65535) {
health_info->batteryChargeTimeToFullNowSeconds = -1;
} else {
health_info->batteryChargeTimeToFullNowSeconds *= kChargeTimeToFullMultiplier;
}
health_info->batteryChargeCounterUah *= kChargeCounterMultiplier;
}
ndk::ScopedAStatus HealthImpl::getChargeCounterUah(int32_t* out) {
*out *= kChargeCounterMultiplier;
return ndk::ScopedAStatus::ok();
}
} // namespace aidl::android::hardware::health
static constexpr const char* gInstanceName = "default";
static constexpr std::string_view gChargerArg{"--charger"};
@@ -80,7 +105,7 @@ int main(int argc, char** argv) {
auto config = std::make_unique<healthd_config>();
qti_healthd_board_init(config.get());
::android::hardware::health::InitHealthdConfig(config.get());
auto binder = ndk::SharedRefBase::make<Health>(gInstanceName, std::move(config));
auto binder = ndk::SharedRefBase::make<aidl::android::hardware::health::HealthImpl>(gInstanceName, std::move(config));
if (argc >= 2 && argv[1] == gChargerArg) {
#if !CHARGER_FORCE_NO_UI