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

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

Change-Id: I45792ef0b01348e2209c4bb648dce57a5b4ec0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zhanglong Xia
2023-08-24 12:03:37 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 5 deletions

View File

@@ -59,10 +59,6 @@ ThreadChip::ThreadChip(char* url) : mUrl(), mRxFrameBuffer(), mCallback(nullptr)
AIBinder_DeathRecipient_setOnUnlinked(mDeathRecipient.get(), ThreadChip::onBinderUnlinkedJump); AIBinder_DeathRecipient_setOnUnlinked(mDeathRecipient.get(), ThreadChip::onBinderUnlinkedJump);
} }
ThreadChip::~ThreadChip() {
AIBinder_DeathRecipient_delete(mDeathRecipient.get());
}
void ThreadChip::onBinderDiedJump(void* context) { void ThreadChip::onBinderDiedJump(void* context) {
reinterpret_cast<ThreadChip*>(context)->onBinderDied(); reinterpret_cast<ThreadChip*>(context)->onBinderDied();
} }

View File

@@ -34,7 +34,7 @@ namespace threadnetwork {
class ThreadChip : public BnThreadChip, ot::Posix::Mainloop::Source { class ThreadChip : public BnThreadChip, ot::Posix::Mainloop::Source {
public: public:
ThreadChip(char* url); ThreadChip(char* url);
~ThreadChip(); ~ThreadChip() {}
ndk::ScopedAStatus open(const std::shared_ptr<IThreadChipCallback>& in_callback) override; ndk::ScopedAStatus open(const std::shared_ptr<IThreadChipCallback>& in_callback) override;
ndk::ScopedAStatus close() override; ndk::ScopedAStatus close() override;