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

Merge "adb: fix deadlock."

Browse source 
am: 68599f5759

Change-Id: I9c57920319ef8b76b313c6fa736a282fe54e857b
This commit is contained in:
Josh Gao 2017-05-31 02:12:20 +00:00 • committed by android-build-merger
commit d5a2cdb72c
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, static int hotplug_callback(libusb_context*, libusb_device* device, libusb_hotplug_event event,
void*) { void*) {
if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) { // We're called with the libusb lock taken. Call these on the main thread outside of this
device_connected(device); // function so that the usb_handle mutex is always taken before the libusb mutex.
} else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT) { fdevent_run_on_main_thread([device, event]() {
device_disconnected(device); if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) {
} device_connected(device);
} else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT) {
device_disconnected(device);
}
});
return 0; return 0;
} }