Merge "bootctl: pass cookie to death recipient" into main am: 50297cce15
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3311020
Change-Id: I1c6e373f4a5c19f1ca6cf12cdc694c94fd8132b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/boot/aidl/client/BootControlClient.cpp b/boot/aidl/client/BootControlClient.cpp
index dca98c6..10f0ffe 100644
--- a/boot/aidl/client/BootControlClient.cpp
+++ b/boot/aidl/client/BootControlClient.cpp
@@ -69,8 +69,8 @@
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;