summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2018-08-14 23:06:58 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-08-14 23:06:58 +0200
commitce2f0d85fb4f06a47c69c49685803ae247e8872f (patch)
tree05fddc49dd14d0e39f51bbd5d0ed5303222d101b /recovery.cpp
parentMerge "updater: Move libupdater to Soong." (diff)
parentrecovery uses IHealth::getService (diff)
downloadandroid_bootable_recovery-ce2f0d85fb4f06a47c69c49685803ae247e8872f.tar
android_bootable_recovery-ce2f0d85fb4f06a47c69c49685803ae247e8872f.tar.gz
android_bootable_recovery-ce2f0d85fb4f06a47c69c49685803ae247e8872f.tar.bz2
android_bootable_recovery-ce2f0d85fb4f06a47c69c49685803ae247e8872f.tar.lz
android_bootable_recovery-ce2f0d85fb4f06a47c69c49685803ae247e8872f.tar.xz
android_bootable_recovery-ce2f0d85fb4f06a47c69c49685803ae247e8872f.tar.zst
android_bootable_recovery-ce2f0d85fb4f06a47c69c49685803ae247e8872f.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp65
1 files changed, 27 insertions, 38 deletions
diff --git a/recovery.cpp b/recovery.cpp
index cc30035df..129909549 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -49,7 +49,7 @@
#include <android-base/unique_fd.h>
#include <bootloader_message/bootloader_message.h>
#include <cutils/properties.h> /* for property_list */
-#include <health2/Health.h>
+#include <healthhalutils/HealthHalUtils.h>
#include <ziparchive/zip_archive.h>
#include "adb_install.h"
@@ -877,42 +877,29 @@ void ui_print(const char* format, ...) {
static bool is_battery_ok(int* required_battery_level) {
using android::hardware::health::V1_0::BatteryStatus;
+ using android::hardware::health::V2_0::get_health_service;
+ using android::hardware::health::V2_0::IHealth;
using android::hardware::health::V2_0::Result;
using android::hardware::health::V2_0::toString;
- using android::hardware::health::V2_0::implementation::Health;
-
- struct healthd_config healthd_config = {
- .batteryStatusPath = android::String8(android::String8::kEmptyString),
- .batteryHealthPath = android::String8(android::String8::kEmptyString),
- .batteryPresentPath = android::String8(android::String8::kEmptyString),
- .batteryCapacityPath = android::String8(android::String8::kEmptyString),
- .batteryVoltagePath = android::String8(android::String8::kEmptyString),
- .batteryTemperaturePath = android::String8(android::String8::kEmptyString),
- .batteryTechnologyPath = android::String8(android::String8::kEmptyString),
- .batteryCurrentNowPath = android::String8(android::String8::kEmptyString),
- .batteryCurrentAvgPath = android::String8(android::String8::kEmptyString),
- .batteryChargeCounterPath = android::String8(android::String8::kEmptyString),
- .batteryFullChargePath = android::String8(android::String8::kEmptyString),
- .batteryCycleCountPath = android::String8(android::String8::kEmptyString),
- .energyCounter = nullptr,
- .boot_min_cap = 0,
- .screen_on = nullptr
- };
- auto health =
- android::hardware::health::V2_0::implementation::Health::initInstance(&healthd_config);
+ android::sp<IHealth> health = get_health_service();
static constexpr int BATTERY_READ_TIMEOUT_IN_SEC = 10;
int wait_second = 0;
while (true) {
auto charge_status = BatteryStatus::UNKNOWN;
- health
- ->getChargeStatus([&charge_status](auto res, auto out_status) {
- if (res == Result::SUCCESS) {
- charge_status = out_status;
- }
- })
- .isOk(); // should not have transport error
+
+ if (health == nullptr) {
+ LOG(WARNING) << "no health implementation is found, assuming defaults";
+ } else {
+ health
+ ->getChargeStatus([&charge_status](auto res, auto out_status) {
+ if (res == Result::SUCCESS) {
+ charge_status = out_status;
+ }
+ })
+ .isOk(); // should not have transport error
+ }
// Treat unknown status as charged.
bool charged = (charge_status != BatteryStatus::DISCHARGING &&
@@ -920,15 +907,17 @@ static bool is_battery_ok(int* required_battery_level) {
Result res = Result::UNKNOWN;
int32_t capacity = INT32_MIN;
- health
- ->getCapacity([&res, &capacity](auto out_res, auto out_capacity) {
- res = out_res;
- capacity = out_capacity;
- })
- .isOk(); // should not have transport error
-
- ui_print("charge_status %d, charged %d, status %s, capacity %" PRId32 "\n", charge_status,
- charged, toString(res).c_str(), capacity);
+ if (health != nullptr) {
+ health
+ ->getCapacity([&res, &capacity](auto out_res, auto out_capacity) {
+ res = out_res;
+ capacity = out_capacity;
+ })
+ .isOk(); // should not have transport error
+ }
+
+ LOG(INFO) << "charge_status " << toString(charge_status) << ", charged " << charged
+ << ", status " << toString(res) << ", capacity " << capacity;
// At startup, the battery drivers in devices like N5X/N6P take some time to load
// the battery profile. Before the load finishes, it reports value 50 as a fake
// capacity. BATTERY_READ_TIMEOUT_IN_SEC is set that the battery drivers are expected