commit 41e15446603950f74fd9e0a2c9e6565d0d5b18b1
author Yifan Hong <elsk@google.com> Thu Aug 02 16:40:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 02 16:40:10 2018 -0700
tree 5fa5ac39ed85c90360c0d2f1e68b4b6e5a41b5f5
parent 15f7302e949faa297703bf3ed3c3373ab37bc626
parent e13b6b62e6c22df0ffbb643ac3e1222c2cd9099f

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

Change-Id: Ica5713f0a6d1bb0dcbcfae5e446649a80e31714a

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 {