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

Merge "Remove the active deletion action of callbacks" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-01-22 10:03:12 +00:00 committed by Gerrit Code Review
commit 2734d2f2bb
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
health/aidl/default/Health.cpp
View file

@ -253,15 +253,6 @@ std::optional<bool> Health::ShouldKeepScreenOn() {
return healthd_config_->screen_on(&props);
}
namespace {
bool IsDeadObjectLogged(const ndk::ScopedAStatus& ret) {
if (ret.isOk()) return false;
if (ret.getStatus() == ::STATUS_DEAD_OBJECT) return true;
LOG(ERROR) << "Cannot call healthInfoChanged on callback: " << ret.getDescription();
return false;
}
} // namespace
//
// Subclass helpers / overrides
//
@ -305,8 +296,10 @@ ndk::ScopedAStatus Health::registerCallback(const std::shared_ptr<IHealthInfoCal
return ndk::ScopedAStatus::ok();
}
if (auto res = callback->healthInfoChanged(health_info); IsDeadObjectLogged(res)) {
(void)unregisterCallback(callback);
auto res = callback->healthInfoChanged(health_info);
if (!res.isOk()) {
LOG(DEBUG) << "Cannot call healthInfoChanged:" << res.getDescription()
<< ". Do nothing here if callback is dead as it will be cleaned up later.";
}
return ndk::ScopedAStatus::ok();
}
@ -353,13 +346,13 @@ ndk::ScopedAStatus Health::update() {
void Health::OnHealthInfoChanged(const HealthInfo& health_info) {
// Notify all callbacks
std::unique_lock<decltype(callbacks_lock_)> lock(callbacks_lock_);
// is_dead notifies a callback and return true if it is dead.
auto is_dead = [&](const auto& linked) {
for (const auto& linked : callbacks_) {
auto res = linked->callback()->healthInfoChanged(health_info);
return IsDeadObjectLogged(res);
};
auto it = std::remove_if(callbacks_.begin(), callbacks_.end(), is_dead);
callbacks_.erase(it, callbacks_.end()); // calls unlinkToDeath on deleted callbacks.
if (!res.isOk()) {
LOG(DEBUG) << "Cannot call healthInfoChanged:" << res.getDescription()
<< ". Do nothing here if callback is dead as it will be cleaned up later.";
}
}
lock.unlock();
// Let HalHealthLoop::OnHealthInfoChanged() adjusts uevent / wakealarm periods