commit 77f91d6a3c013071d642c53def5766b479b79db3
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 05 20:02:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 05 20:02:34 2018 +0000
tree e2f69b7526aac5f5ebd0e6d13a9356fa63ce5a7a
parent b3220c1c8b4ba2cd01eb1e6ef197fbbba0fcfc84
parent e5e53201d1eec2d91df6543302f2c1b2bc1d4fb4

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

adb/client/adb_client.cpp

diff --git a/adb/client/adb_client.cpp b/adb/client/adb_client.cpp
index 1959258..eda4b77 100644
--- a/adb/client/adb_client.cpp
+++ b/adb/client/adb_client.cpp
@@ -185,6 +185,11 @@
         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;
 }