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

Commit 41e15446 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "lshal: close fd before joining thread" am: 16b9f38d

am: e13b6b62

Change-Id: Ica5713f0a6d1bb0dcbcfae5e446649a80e31714a
parents 15f7302e e13b6b62
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -77,13 +77,12 @@ void PipeRelay::CloseFd(int *fd) {

PipeRelay::~PipeRelay() {
    CloseFd(&mFds[1]);
    CloseFd(&mFds[0]);

    if (mThread != nullptr) {
        mThread->join();
        mThread.clear();
    }

    CloseFd(&mFds[0]);
}

status_t PipeRelay::initCheck() const {