Merge "[REFACTOR] health 2.0: BatteryMonitor::update split into 3 funcs" am: 17fad82187

am: 7970a4ad28

Change-Id: Ief54d2cca6a54c3f065fc0c0b7663e39f56270b0
This commit is contained in:
Yifan Hong
2019-10-22 16:15:07 -07:00
committed by android-build-merger

View File

@@ -148,7 +148,14 @@ Return<Result> Health::update() {
// Retrieve all information and call healthd_mode_ops->battery_update, which calls
// notifyListeners.
bool chargerOnline = battery_monitor_->update();
battery_monitor_->updateValues();
struct BatteryProperties props = getBatteryProperties(battery_monitor_.get());
bool log = healthd_board_battery_update(&props);
if (log) {
battery_monitor_->logValues();
}
healthd_mode_ops->battery_update(&props);
bool chargerOnline = battery_monitor_->isChargerOnline();
// adjust uevent / wakealarm periods
healthd_battery_update_internal(chargerOnline);