commit | ada6f49004bcf12494739ef0645c6d6d88de1903 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Mon May 14 19:09:19 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 14 19:09:19 2018 -0700 |
tree | cef182a36e3ec0fd18577905e661763ce417f929 | |
parent | 1120cec7825b2ce0f06f65779f1072532331c0f1 [diff] | |
parent | 581d06d5884317576f9ba5e2ec6621b0adffa7ad [diff] |
Merge "adb: fix double close in jdwp_service." am: da6ab73420 am: c4c55853f0 Change-Id: I08f773eede00bc05af80777c19570d5b005004d6
diff --git a/adb/daemon/jdwp_service.cpp b/adb/daemon/jdwp_service.cpp index 89577cb..3a3f399 100644 --- a/adb/daemon/jdwp_service.cpp +++ b/adb/daemon/jdwp_service.cpp
@@ -292,8 +292,6 @@ goto CloseProcess; } - adb_close(fd); - D("sent file descriptor %d to JDWP process %d", fd, proc->pid); proc->out_fds.pop_back();