commit | cbf53ff3aa3d051d38245c61becadc5e8b94ec23 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Mon Mar 20 20:04:38 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Mar 20 20:04:38 2017 +0000 |
tree | bfdfb64b30e16e95750ef5b75deaf9920361441f | |
parent | 7a6ca5ec75d7a4bdfa2e8f3d7b24b8d6f686d8a0 [diff] | |
parent | bc46f6b0a09e9c9df80a55e2fb3b6246cfb002b9 [diff] |
Merge "adb: detect closed jdwp socket." am: e1c4e04f82 Change-Id: Ife55285da64e0c12dac3cd8e8171126c3bb8b543
diff --git a/jdwp_service.cpp b/jdwp_service.cpp index 9589d88..af911bf 100644 --- a/jdwp_service.cpp +++ b/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; }