Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 779ddee8 authored by Zhanglong Xia's avatar Zhanglong Xia Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I0eebd4491b62a1998c39f017740a6d261fe80008
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c671181a f865a8b7

threadnetwork/aidl/default/thread_chip.cpp

+0 −4
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ ThreadChip::ThreadChip(char* url) : mUrl(), mRxFrameBuffer(), mCallback(nullptr) 
    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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace threadnetwork { 
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;