openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "adb: kick the transport after sending the "adb root" command" 

This reverts commit d15e6ac95d.

Also increment adb version to 1.0.29

Change-Id: I890643f0c18a2fe90f170134df039c54116cecda
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood 2011-06-22 07:14:54 -04:00
parent 693e78b9b6
commit 07edefe4ce
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adb/adb.h
View File

@ -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
*/

16
adb/sockets.c
View File

@ -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");
}