diff options
author | Mike Lockwood <lockwood@android.com> | 2011-06-22 07:14:54 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2011-06-22 07:15:44 -0400 |
commit | 07edefe4cecbddaf6282e556e04a1e1ef21c404a (patch) | |
tree | 472dfe88bb18f926e834526de01bff00ce667911 /adb | |
parent | 693e78b9b61da835b6d2f88348bb99ab0840b37e (diff) | |
download | system_core-07edefe4cecbddaf6282e556e04a1e1ef21c404a.zip system_core-07edefe4cecbddaf6282e556e04a1e1ef21c404a.tar.gz system_core-07edefe4cecbddaf6282e556e04a1e1ef21c404a.tar.bz2 |
Revert "adb: kick the transport after sending the "adb root" command"
This reverts commit d15e6ac95dc898fb78fb5917bb2e4498b40b716f.
Also increment adb version to 1.0.29
Change-Id: I890643f0c18a2fe90f170134df039c54116cecda
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'adb')
-rw-r--r-- | adb/adb.h | 8 | ||||
-rw-r--r-- | adb/sockets.c | 16 |
2 files changed, 1 insertions, 23 deletions
@@ -35,7 +35,7 @@ #define ADB_VERSION_MAJOR 1 // Used for help/version information #define ADB_VERSION_MINOR 0 // Used for help/version information -#define ADB_SERVER_VERSION 28 // Increment this when we want to force users to start a new adb server +#define ADB_SERVER_VERSION 29 // Increment this when we want to force users to start a new adb server typedef struct amessage amessage; typedef struct apacket apacket; @@ -86,12 +86,6 @@ struct asocket { */ int closing; - /* flag: kick the transport when the socket is closed. - ** This is needed to handle commands that cause the - ** remote daemon to terminate, like "adb root" - */ - int kick_on_close; - /* the asocket we are connected to */ diff --git a/adb/sockets.c b/adb/sockets.c index 80152f2..df223b1 100644 --- a/adb/sockets.c +++ b/adb/sockets.c @@ -190,14 +190,6 @@ static void local_socket_ready(asocket *s) static void local_socket_close(asocket *s) { -#if ADB_HOST - /* to special case commands that cause the remote daemon to terminate */ - if (s->kick_on_close && s->transport) { - kick_transport(s->transport); - /* delay to work around a race condition */ - adb_sleep_ms(1000); - } -#endif adb_mutex_lock(&socket_list_lock); local_socket_close_locked(s); adb_mutex_unlock(&socket_list_lock); @@ -535,14 +527,6 @@ void connect_to_remote(asocket *s, const char *destination) apacket *p = get_apacket(); int len = strlen(destination) + 1; -#if ADB_HOST - /* special case commands that cause the remote daemon to terminate */ - if (!strcmp(destination, "root:")) { - D("connect_to_remote setting kick_on_close for %s\n", destination); - s->kick_on_close = 1; - } -#endif - if(len > (MAX_PAYLOAD-1)) { fatal("destination oversized"); } |