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

am f03aa667: am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread."

Browse source 
* commit 'f03aa6670e39ef1a46211960d134b2528a3649f5':
  adb: keep all asocket operations in the main thread.
This commit is contained in:
Yabin Cui 2015-08-26 19:55:19 +00:00 • committed by Android Git Automerger
commit 4edb97abb7
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/adb.cpp
View file

@ -243,6 +243,11 @@ void handle_offline(atransport *t)
D("adb: offline\n"); D("adb: offline\n");
//Close the associated usb //Close the associated usb
t->online = 0; t->online = 0;
// This is necessary to avoid a race condition that occured when a transport closes
// while a client socket is still active.
close_all_sockets(t);
run_transport_disconnects(t); run_transport_disconnects(t);
} }

4
adb/transport.cpp
View file

@ -330,10 +330,6 @@ static void *input_thread(void *_t)
put_apacket(p); put_apacket(p);
} }
// this is necessary to avoid a race condition that occured when a transport closes
// while a client socket is still active.
close_all_sockets(t);
D("%s: transport input thread is exiting, fd %d\n", t->serial, t->fd); D("%s: transport input thread is exiting, fd %d\n", t->serial, t->fd);
kick_transport(t); kick_transport(t);
transport_unref(t); transport_unref(t);