summaryrefslogtreecommitdiffstats
path: root/adb/adb.h
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2013-03-29 18:22:36 -0700
committerBenoit Goby <benoit@android.com>2013-04-25 12:34:49 -0700
commit1c45ee92e2372f3c552744823143fb093fdbda9d (patch)
tree5b226fa464c50da9b6242354a43384020a04d086 /adb/adb.h
parentdb50747c933be0d87658385e3fad04ae824a8e5e (diff)
downloadsystem_core-1c45ee92e2372f3c552744823143fb093fdbda9d.zip
system_core-1c45ee92e2372f3c552744823143fb093fdbda9d.tar.gz
system_core-1c45ee92e2372f3c552744823143fb093fdbda9d.tar.bz2
adb: Handle adb connect in a thread
adb connect calls connect() in the event loop. If you pass a wrong ip address or the server is slow to respond, this will block the event loop and you can't even kill the adb server with adb kill-server. Handle connect requests in a service thread instead. Change-Id: I2ee732869a3dc22a6d3b87cf8ac80acaa7790037
Diffstat (limited to 'adb/adb.h')
-rw-r--r--adb/adb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/adb.h b/adb/adb.h
index 38767e5..622ca70 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -289,7 +289,7 @@ void init_usb_transport(atransport *t, usb_handle *usb, int state);
void close_usb_devices();
/* cause new transports to be init'd and added to the list */
-void register_socket_transport(int s, const char *serial, int port, int local);
+int register_socket_transport(int s, const char *serial, int port, int local);
/* these should only be used for the "adb disconnect" command */
void unregister_transport(atransport *t);