Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f666675 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove the active deletion action of callbacks" into main am: 2734d2f2 am: 288f14e3 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2730951



Change-Id: I16dad9ef335ce966e9ddcd8c5e4f4bcfcd2c4ac2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc9ffa87 288f14e3

health/aidl/default/Health.cpp

+10 −17
Original line number Diff line number Diff line
@@ -254,15 +254,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

//
@@ -306,8 +297,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();

}
@@ -354,13 +347,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