Skip to content
Snippets Groups Projects
Commit 91a25771 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "adb: really make kill-server wait for server death"

parents 4a166302 c8ad0ca6
No related branches found
No related tags found
No related merge requests found
......@@ -185,6 +185,11 @@ bool adb_kill_server() {
return false;
}
// The server might send OKAY, so consume that.
char buf[4];
ReadFdExactly(fd, buf, 4);
// Now that no more data is expected, wait for socket orderly shutdown or error, indicating
// server death.
ReadOrderlyShutdown(fd);
return true;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment