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

Commit c84dc596 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 am: 41e15446 

am: 9d6c8db4

Change-Id: I392b7ceed13d56986fc8a83230a715ae39116530
parents 4d2a75e5 9d6c8db4

cmds/lshal/PipeRelay.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -77,13 +77,12 @@ void PipeRelay::CloseFd(int *fd) { 




PipeRelay::~PipeRelay() {

PipeRelay::~PipeRelay() {

    CloseFd(&mFds[1]);

    CloseFd(&mFds[1]);

    CloseFd(&mFds[0]);





    if (mThread != nullptr) {

    if (mThread != nullptr) {

        mThread->join();

        mThread->join();

        mThread.clear();

        mThread.clear();

    }

    }



    CloseFd(&mFds[0]);

}

}





status_t PipeRelay::initCheck() const {

status_t PipeRelay::initCheck() const {