summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2018-05-15 04:50:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-15 04:50:43 +0000
commit09b309807ff4cbf53545749dabbfe2838a1755ff (patch)
tree644068dcf24ff06c3d68cb3d0bb8e1463360557f
parent0051684905e093c8c8ac5cc9f861392fea9d0b0c (diff)
parentd88f3b696425373c927736bea907c172afc28b7d (diff)
downloadcore-09b309807ff4cbf53545749dabbfe2838a1755ff.tar.gz
Merge "adb: fix double close in jdwp_service." into pi-dev
-rw-r--r--adb/jdwp_service.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index 6f5396a8f..5f070d917 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -292,8 +292,6 @@ static void jdwp_process_event(int socket, unsigned events, void* _proc) {
goto CloseProcess;
}
- adb_close(fd);
-
D("sent file descriptor %d to JDWP process %d", fd, proc->pid);
proc->out_fds.pop_back();