commit def7f619ebb49ac234adce976126a93a1c3a5d26
author Josh Gao <jmgao@google.com> Mon Mar 20 20:08:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 20 20:08:09 2017 +0000
tree 69596adfcc78f63ca76a4d904948a3b8bc5d78d5
parent 85a6e0b21d47787c6a576e48d38b785bc745a5ef
parent 89b07bf392707f7f924a3eb2eeb38030c64f6b84

Merge "adb: detect closed jdwp socket." am: e1c4e04f82
am: 7e5b10b18c

Change-Id: Idc8db41aab19b5895b28642b77821f1fa4610218

adb/jdwp_service.cpp

diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index 9589d88..af911bf 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -232,11 +232,7 @@
             size_t size = PID_LEN - proc->in_len;
 
             ssize_t rc = TEMP_FAILURE_RETRY(recv(socket, p, size, 0));
-            if (rc < 0) {
-                if (errno == EAGAIN) {
-                    return;
-                }
-
+            if (rc <= 0) {
                 D("failed to read jdwp pid: %s", strerror(errno));
                 goto CloseProcess;
             }