openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Health@2.0: uses @1.0::HealthInfo 

Revert "Update for expanding @2.0::HealthInfo."
BatteryService does not use these fields for posting
sticky intents.

This reverts commit be17a4f235.
Test: boots
Bug: 63702641

Change-Id: I4df61645ab38a8e205ee21efc86bbef3e39674ab
This commit is contained in:
Yifan Hong 2017-11-06 20:50:45 +00:00
parent f1b9b7e9ec
commit 1106e83c54
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
healthd/Health.cpp
View File

@ -120,7 +120,7 @@ Return<Result> Health::update() {
}
// Retrieve all information and call healthd_mode_ops->battery_update, which calls
// updateAndNotify.
// notifyListeners.
bool chargerOnline = battery_monitor_->update();
// adjust uevent / wakealarm periods
@ -129,19 +129,10 @@ Return<Result> Health::update() {
return Result::SUCCESS;
}
void Health::updateAndNotify(HealthInfo* info) {
// update 2.0 specific fields
struct BatteryProperty prop;
if (battery_monitor_->getProperty(BATTERY_PROP_CURRENT_AVG, &prop) == OK)
info->batteryCurrentAverage = static_cast<int32_t>(prop.valueInt64);
if (battery_monitor_->getProperty(BATTERY_PROP_CAPACITY, &prop) == OK)
info->batteryCapacity = static_cast<int32_t>(prop.valueInt64);
if (battery_monitor_->getProperty(BATTERY_PROP_ENERGY_COUNTER, &prop) == OK)
info->energyCounter = prop.valueInt64;
void Health::notifyListeners(const HealthInfo& info) {
std::lock_guard<std::mutex> _lock(callbacks_lock_);
for (auto it = callbacks_.begin(); it != callbacks_.end();) {
auto ret = (*it)->healthInfoChanged(*info);
auto ret = (*it)->healthInfoChanged(info);
if (!ret.isOk() && ret.isDeadObject()) {
it = callbacks_.erase(it);
} else {

8
healthd/HealthService.cpp
View File

@ -28,8 +28,8 @@
using android::hardware::IPCThreadState;
using android::hardware::configureRpcThreadpool;
using android::hardware::health::V1_0::HealthInfo;
using android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;
using android::hardware::health::V2_0::HealthInfo;
using android::hardware::health::V2_0::IHealth;
using android::hardware::health::V2_0::implementation::Health;
@ -89,9 +89,9 @@ void healthd_mode_service_2_0_battery_update(struct android::BatteryProperties*
// Implementation-defined update logic goes here. An implementation
// can make modifications to prop before broadcasting it to all callbacks.
HealthInfo info{};
convertToHealthInfo(prop, info.legacy);
static_cast<Health*>(gHealth.get())->updateAndNotify(&info);
HealthInfo info;
convertToHealthInfo(prop, info);
static_cast<Health*>(gHealth.get())->notifyListeners(info);
}
static struct healthd_mode_ops healthd_mode_service_2_0_ops = {

3
healthd/include/health2/Health.h
View File

@ -16,6 +16,7 @@ namespace V2_0 {
namespace implementation {
using V1_0::BatteryStatus;
using V1_0::HealthInfo;
using ::android::hidl::base::V1_0::IBase;
@ -24,7 +25,7 @@ struct Health : public IHealth, hidl_death_recipient {
Health(struct healthd_config* c);
// TODO(b/62229583): clean up and hide these functions.
void updateAndNotify(HealthInfo* info);
void notifyListeners(const HealthInfo& info);
// Methods from IHealth follow.
Return<Result> registerCallback(const sp<IHealthInfoCallback>& callback) override;