diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-19 23:22:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 23:22:21 +0000 |
| commit | 0e71e3ab9cf66f41645ea286c7e62ed2b657ca38 (patch) | |
| tree | 2b4e637998e2a50b65d82a235c03f9f9ba087170 /adb | |
| parent | 5b654f15313f1ad27246269f6e34214ddb798405 (diff) | |
| parent | 9cae50b38d6a58efe0799ef3697f594cb4b100f9 (diff) | |
| download | system_core-0e71e3ab9cf66f41645ea286c7e62ed2b657ca38.tar.gz system_core-0e71e3ab9cf66f41645ea286c7e62ed2b657ca38.tar.bz2 system_core-0e71e3ab9cf66f41645ea286c7e62ed2b657ca38.zip | |
am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"
* commit '9cae50b38d6a58efe0799ef3697f594cb4b100f9':
Bound the ADB connect time with a non-blocking connect
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/services.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/services.c b/adb/services.c index dcaf276b8..e25a232c8 100644 --- a/adb/services.c +++ b/adb/services.c @@ -447,7 +447,7 @@ static void connect_device(char* host, char* buffer, int buffer_size) 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; |