diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-04 16:17:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 16:17:15 +0000 |
| commit | c8034164bb828549b9dd2ff5037f1ce692c675aa (patch) | |
| tree | ccb180cffb25f7c2cb74ab3b90c32f758d59cfe0 /adb | |
| parent | 052aff16ce1963dbe4814f9b5d28d6458cf06077 (diff) | |
| parent | fa969cd1f93d186acc9ce781fffa6a2f66f915ea (diff) | |
| download | system_core-c8034164bb828549b9dd2ff5037f1ce692c675aa.zip system_core-c8034164bb828549b9dd2ff5037f1ce692c675aa.tar.gz system_core-c8034164bb828549b9dd2ff5037f1ce692c675aa.tar.bz2 | |
am fa969cd1: am 023bc0a4: Merge "Fix deadlocks."
* commit 'fa969cd1f93d186acc9ce781fffa6a2f66f915ea':
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); } |