am 023bc0a4: Merge "Fix deadlocks." (fa969cd1) · Commits · e / os / android_system_core

adb/framebuffer_service.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}