ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix deadlocks."

Browse source
This commit is contained in:
Elliott Hughes 2014-12-03 18:38:04 +00:00 • committed by Gerrit Code Review
commit 023bc0a426
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/framebuffer_service.c
View file

@ -76,6 +76,7 @@ void framebuffer_service(int fd, void *cookie)
exit(1); exit(1);
} }
close(fds[1]);
fd_screencap = fds[0]; fd_screencap = fds[0];
/* read w, h & format */ /* read w, h & format */
@ -173,10 +174,9 @@ void framebuffer_service(int fd, void *cookie)
} }
done: done:
TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
close(fds[0]); close(fds[0]);
close(fds[1]);
TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
pipefail: pipefail:
close(fd); close(fd);
} }