commit 779ddee8ba9742663787bf009a41c7eae72cad2d
author Zhanglong Xia <zhanglongxia@google.com> Thu Aug 24 10:13:41 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 24 10:13:41 2023 +0000
tree 3716e4dbfbb2f31e5c752713c782eac41c073bb9
parent c671181af82798160325fc1622d0358310c8fe2d
parent f865a8b7cd7b6fc446f042bc840483235c4d902a

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

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

Change-Id: I0eebd4491b62a1998c39f017740a6d261fe80008
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;