| commit | c4c55853f0913f19d612d6c842538eedb586cfa8 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Mon May 14 19:05:11 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 14 19:05:11 2018 -0700 |
| tree | 64ef171d1bcdea841b0416d00c3740c45698683a | |
| parent | 35c36f32de9e6fd9d4f24b59233a98e70293ecc9 [diff] | |
| parent | da6ab73420760da9fe39ba3f26068c6d1ad46537 [diff] |
Merge "adb: fix double close in jdwp_service." am: da6ab73420 Change-Id: Ifcf07cefa0279b8f4c8ac4d55db46b6701b86595
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();