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

Commit c1e46608 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:... 

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

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



Change-Id: I5251f37e1c6649f4d0c596e8225f7f599ebb8eee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 92d84c0c 779ddee8

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;