commit cd3e94d6b83a7b547067e9c51c6badf71e51c56b
author Zhanglong Xia <zhanglongxia@google.com> Thu Aug 24 11:35:34 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 24 11:35:34 2023 +0000
tree 2c37332fbf91961c37380c409fab93599a1646ba
parent 69f195afeeec977b124e1aaaee610bbe637adc88
parent c1e4660802b870206c7404e96c3e734033ba46df

Merge "remove manually freeing the variable mDeathRecipient" into main am: f865a8b7cd am: 779ddee8ba am: c1e4660802

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

Change-Id: I7ce96f063565199f5ae01fa58cbbdec7db6259c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

threadnetwork/aidl/default/thread_chip.cpp

diff --git a/threadnetwork/aidl/default/thread_chip.cpp b/threadnetwork/aidl/default/thread_chip.cpp
index 3d38cb8..9358eba 100644
--- a/threadnetwork/aidl/default/thread_chip.cpp
+++ b/threadnetwork/aidl/default/thread_chip.cpp
@@ -59,10 +59,6 @@
     AIBinder_DeathRecipient_setOnUnlinked(mDeathRecipient.get(), ThreadChip::onBinderUnlinkedJump);
 }
 
-ThreadChip::~ThreadChip() {
-    AIBinder_DeathRecipient_delete(mDeathRecipient.get());
-}
-
 void ThreadChip::onBinderDiedJump(void* context) {
     reinterpret_cast<ThreadChip*>(context)->onBinderDied();
 }

threadnetwork/aidl/default/thread_chip.hpp

diff --git a/threadnetwork/aidl/default/thread_chip.hpp b/threadnetwork/aidl/default/thread_chip.hpp
index 1ab6d54..680580a 100644
--- a/threadnetwork/aidl/default/thread_chip.hpp
+++ b/threadnetwork/aidl/default/thread_chip.hpp
@@ -34,7 +34,7 @@
 class ThreadChip : public BnThreadChip, ot::Posix::Mainloop::Source {
   public:
     ThreadChip(char* url);
-    ~ThreadChip();
+    ~ThreadChip() {}
 
     ndk::ScopedAStatus open(const std::shared_ptr<IThreadChipCallback>& in_callback) override;
     ndk::ScopedAStatus close() override;