diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-04 09:22:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 09:22:00 +0000 |
| commit | fa969cd1f93d186acc9ce781fffa6a2f66f915ea (patch) | |
| tree | 4bc0a5f23d1e4d4f4bf1b499791631b1d901a6d7 /adb | |
| parent | 96bc6841240d09050ef336461b9a13792f8080ed (diff) | |
| parent | 023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a (diff) | |
| download | system_core-fa969cd1f93d186acc9ce781fffa6a2f66f915ea.zip system_core-fa969cd1f93d186acc9ce781fffa6a2f66f915ea.tar.gz system_core-fa969cd1f93d186acc9ce781fffa6a2f66f915ea.tar.bz2 | |
am 023bc0a4: Merge "Fix deadlocks."
* commit '023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a':
Fix deadlocks.
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/framebuffer_service.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c index 8cbe840..61578aa 100644 --- a/adb/framebuffer_service.c +++ b/adb/framebuffer_service.c @@ -76,6 +76,7 @@ void framebuffer_service(int fd, void *cookie) exit(1); } + close(fds[1]); fd_screencap = fds[0]; /* read w, h & format */ @@ -173,10 +174,9 @@ void framebuffer_service(int fd, void *cookie) } done: - TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); - close(fds[0]); - close(fds[1]); + + TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); pipefail: close(fd); } |