commit 9d6c8db4a077e6e095c39b25cc497e6714aa39f5
author Yifan Hong <elsk@google.com> Thu Aug 02 16:52:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 02 16:52:25 2018 -0700
tree c6c69c6bb96abd22da66d8de774954dc3a097ac3
parent 54a7ab498c8e1165456b4941473702ae8533162c
parent 41e15446603950f74fd9e0a2c9e6565d0d5b18b1

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

Change-Id: I052e7988c857de51e273af44f716d347813c8073

cmds/lshal/PipeRelay.cpp

diff --git a/cmds/lshal/PipeRelay.cpp b/cmds/lshal/PipeRelay.cpp
index 87d75ac..3a17e03 100644
--- a/cmds/lshal/PipeRelay.cpp
+++ b/cmds/lshal/PipeRelay.cpp
@@ -77,13 +77,12 @@
 
 PipeRelay::~PipeRelay() {
     CloseFd(&mFds[1]);
+    CloseFd(&mFds[0]);
 
     if (mThread != nullptr) {
         mThread->join();
         mThread.clear();
     }
-
-    CloseFd(&mFds[0]);
 }
 
 status_t PipeRelay::initCheck() const {