| commit | c1e4660802b870206c7404e96c3e734033ba46df | [log] [tgz] |
|---|---|---|
| author | Zhanglong Xia <zhanglongxia@google.com> | Thu Aug 24 10:55:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 24 10:55:35 2023 +0000 |
| tree | 2c37332fbf91961c37380c409fab93599a1646ba | |
| parent | 92d84c0c04e8a4043f331f56d2b89177229d4f1f [diff] | |
| parent | 779ddee8ba9742663787bf009a41c7eae72cad2d [diff] |
Merge "remove manually freeing the variable mDeathRecipient" into main am: f865a8b7cd am: 779ddee8ba Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2725094 Change-Id: I5251f37e1c6649f4d0c596e8225f7f599ebb8eee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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(); }
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;