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

Merge "adb: fix deadlock."

This commit is contained in:
Treehugger Robot 2017-05-31 02:03:40 +00:00 committed by Gerrit Code Review
parent 45d0cbf00b d1a3e8f1ab
commit 68599f5759
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
adb/client/usb_libusb.cpp
View File

@ -427,11 +427,15 @@ static void device_disconnected(libusb_device* device) {
static int hotplug_callback(libusb_context*, libusb_device* device, libusb_hotplug_event event,
void*) {
if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) {
device_connected(device);
} else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT) {
device_disconnected(device);
}
// We're called with the libusb lock taken. Call these on the main thread outside of this
// function so that the usb_handle mutex is always taken before the libusb mutex.
fdevent_run_on_main_thread([device, event]() {
if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) {
device_connected(device);
} else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT) {
device_disconnected(device);
}
});
return 0;
}