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

Commit 1be230d1 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "bootctl: pass cookie to death recipient" into main am: 50297cce am: 57433fbc 

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



Change-Id: Ic6660f00e2c411aa5725720959b8adbe46f86892
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22e5c4ac 57433fbc

boot/aidl/client/BootControlClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ class BootControlClientAidl final : public BootControlClient { 
    explicit BootControlClientAidl(std::shared_ptr<IBootControl> module)

        : module_(module),

          boot_control_death_recipient(AIBinder_DeathRecipient_new(onBootControlServiceDied)) {

        binder_status_t status = AIBinder_linkToDeath(module->asBinder().get(),

                                                      boot_control_death_recipient, nullptr);

        binder_status_t status =

                AIBinder_linkToDeath(module->asBinder().get(), boot_control_death_recipient, this);

        if (status != STATUS_OK) {

            LOG(ERROR) << "Could not link to binder death";

            return;