commit c8034164bb828549b9dd2ff5037f1ce692c675aa
author Elliott Hughes <enh@google.com> Thu Dec 04 16:17:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 04 16:17:15 2014 +0000
tree ccb180cffb25f7c2cb74ab3b90c32f758d59cfe0
parent 052aff16ce1963dbe4814f9b5d28d6458cf06077
parent fa969cd1f93d186acc9ce781fffa6a2f66f915ea

am fa969cd1: am 023bc0a4: Merge "Fix deadlocks."

* commit 'fa969cd1f93d186acc9ce781fffa6a2f66f915ea':
  Fix deadlocks.

adb/framebuffer_service.c

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 @@
         exit(1);
     }
 
+    close(fds[1]);
     fd_screencap = fds[0];
 
     /* read w, h & format */
@@ -173,10 +174,9 @@
     }
 
 done:
-    TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
-
     close(fds[0]);
-    close(fds[1]);
+
+    TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
 pipefail:
     close(fd);
 }