commit c84dc596bfd1d20672f82f816019f5dc1327c9bd
author Yifan Hong <elsk@google.com> Thu Aug 02 17:23:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 02 17:23:56 2018 -0700
tree 9d33998f69cd416e3729f134742f280c1a82cb73
parent 4d2a75e50fb26b1d0b08d37fe10a25b1144d971d
parent 9d6c8db4a077e6e095c39b25cc497e6714aa39f5

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

Change-Id: I392b7ceed13d56986fc8a83230a715ae39116530

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 {