commit fa969cd1f93d186acc9ce781fffa6a2f66f915ea
author Elliott Hughes <enh@google.com> Thu Dec 04 09:22:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 04 09:22:00 2014 +0000
tree 4bc0a5f23d1e4d4f4bf1b499791631b1d901a6d7
parent 96bc6841240d09050ef336461b9a13792f8080ed
parent 023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a

am 023bc0a4: Merge "Fix deadlocks."

* commit '023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a':
  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);
 }