diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-20 00:23:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 00:23:08 +0000 |
| commit | 3edc25271fd6696cede2d0e6ecdcaf3d6cc273a5 (patch) | |
| tree | 7eb54f9078942ec6a09169be28b4632ac83f2c5b /include/cutils | |
| parent | fbc5ca28c965add95bd5751525b09d70b0db76dc (diff) | |
| parent | b42f141315ae0929325335645d397db04a500c88 (diff) | |
| download | system_core-3edc25271fd6696cede2d0e6ecdcaf3d6cc273a5.zip system_core-3edc25271fd6696cede2d0e6ecdcaf3d6cc273a5.tar.gz system_core-3edc25271fd6696cede2d0e6ecdcaf3d6cc273a5.tar.bz2 | |
am b42f1413: am 0e71e3ab: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"
* commit 'b42f141315ae0929325335645d397db04a500c88':
Bound the ADB connect time with a non-blocking connect
Diffstat (limited to 'include/cutils')
| -rw-r--r-- | include/cutils/sockets.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h index 19cae0c..daf43ec 100644 --- a/include/cutils/sockets.h +++ b/include/cutils/sockets.h @@ -86,6 +86,8 @@ static inline int android_get_control_socket(const char *name) extern int socket_loopback_client(int port, int type); extern int socket_network_client(const char *host, int port, int type); +extern int socket_network_client_timeout(const char *host, int port, int type, + int timeout); extern int socket_loopback_server(int port, int type); extern int socket_local_server(const char *name, int namespaceId, int type); extern int socket_local_server_bind(int s, const char *name, int namespaceId); |