commit c809b24199c48f08ef3bcffb35745cbeaec8bd44
author Elliott Hughes <enh@google.com> Tue May 20 00:23:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 20 00:23:08 2014 +0000
tree ca21b120a7a2b26507054010b7ff042a1e90f36b
parent b24da6218fc47cd4a38d44667435789ea2d03f8d
parent a9b6b3c82ff6b5be2d7c8226d9532edf8612f77e

am a9b6b3c8: am f7c9b701: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"

* commit 'a9b6b3c82ff6b5be2d7c8226d9532edf8612f77e':
  Bound the ADB connect time with a non-blocking connect

services.c

diff --git a/services.c b/services.c
index dcaf276..e25a232 100644
--- a/services.c
+++ b/services.c
@@ -447,7 +447,7 @@
 
     snprintf(serial, sizeof(serial), "%s:%d", hostbuf, port);
 
-    fd = socket_network_client(hostbuf, port, SOCK_STREAM);
+    fd = socket_network_client_timeout(hostbuf, port, SOCK_STREAM, 10);
     if (fd < 0) {
         snprintf(buffer, buffer_size, "unable to connect to %s:%d", host, port);
         return;