diff options
| author | Yifan Hong <elsk@google.com> | 2018-08-02 16:29:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-02 16:29:17 -0700 |
| commit | e13b6b62e6c22df0ffbb643ac3e1222c2cd9099f (patch) | |
| tree | 1af92a82f2229c9af52e884f95d713bcd7ea13ed | |
| parent | 9ead54bed65d486fe435793cbe98ed8b4786f7be (diff) | |
| parent | 16b9f38d2245028256954490458971efe65af329 (diff) | |
| download | native-temp_p_merge.tar.gz | |
Merge "lshal: close fd before joining thread"temp_p_merge
am: 16b9f38d22
Change-Id: I7ab9f8e64e01dd5b1f2edba2e5db8404d8073b4c
| -rw-r--r-- | cmds/lshal/PipeRelay.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/lshal/PipeRelay.cpp b/cmds/lshal/PipeRelay.cpp index 87d75ac2d4..3a17e03050 100644 --- a/cmds/lshal/PipeRelay.cpp +++ b/cmds/lshal/PipeRelay.cpp @@ -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 { |