ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev

Browse source
This commit is contained in:
Benoit Goby 2013-04-02 01:44:49 +00:00 • committed by Android (Google) Code Review
commit 7f8fb3ffa2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adb/adb_auth_client.c
View file

@ -161,7 +161,7 @@ int adb_auth_verify(void *token, void *sig, int siglen)
static void usb_disconnected(void* unused, atransport* t) static void usb_disconnected(void* unused, atransport* t)
{ {
D("USB disconnect"); D("USB disconnect\n");
remove_transport_disconnect(usb_transport, &usb_disconnect); remove_transport_disconnect(usb_transport, &usb_disconnect);
usb_transport = NULL; usb_transport = NULL;
needs_retry = false; needs_retry = false;
@ -175,7 +175,7 @@ static void adb_auth_event(int fd, unsigned events, void *data)
if (events & FDE_READ) { if (events & FDE_READ) {
ret = unix_read(fd, response, sizeof(response)); ret = unix_read(fd, response, sizeof(response));
if (ret < 0) { if (ret < 0) {
D("Framework disconnect"); D("Framework disconnect\n");
if (usb_transport) if (usb_transport)
fdevent_remove(&usb_transport->auth_fde); fdevent_remove(&usb_transport->auth_fde);
framework_fd = -1; framework_fd = -1;
@ -192,8 +192,10 @@ void adb_auth_confirm_key(unsigned char *key, size_t len, atransport *t)
char msg[MAX_PAYLOAD]; char msg[MAX_PAYLOAD];
int ret; int ret;
usb_transport = t; if (!usb_transport) {
add_transport_disconnect(t, &usb_disconnect); usb_transport = t;
add_transport_disconnect(t, &usb_disconnect);
}
if (framework_fd < 0) { if (framework_fd < 0) {
D("Client not connected\n"); D("Client not connected\n");