summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yifan Hong <elsk@google.com> 2018-08-02 23:16:35 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-08-02 23:16:35 +0000
commit16b9f38d2245028256954490458971efe65af329 (patch)
tree668f94f78ec9cbcdbd80bdcc60abc783ae19a536
parentad0f33eaf156e70d4990c83b08bf6630b7026de1 (diff)
parentb9d19c87abce709ba11da4f0307cc6922b9aa52d (diff)
Merge "lshal: close fd before joining thread"
-rw-r--r--cmds/lshal/PipeRelay.cpp3
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 {