Merge "lshal: close fd before joining thread" am: 16b9f38d22 am: e13b6b62e6 am: 41e1544660

am: 9d6c8db4a0

Change-Id: I392b7ceed13d56986fc8a83230a715ae39116530

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 {