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

Merge "fastboot: gracefully handle failure to open a USB device on OS X."

Browse source 
am: 11be3e54bd

Change-Id: I366df52af24947a746fee515a8d16ff728a01deb
This commit is contained in:
Josh Gao 2017-08-21 18:42:01 +00:00 • committed by android-build-merger
commit 9a1e060dc6
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fastboot/usb_osx.cpp
View file

@ -93,12 +93,9 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) {
SInt32 score;
UInt8 interfaceNumEndpoints;
// Placing the constant KIOUSBFindInterfaceDontCare into the following
// fields of the IOUSBFindInterfaceRequest structure will allow us to
// find all of the interfaces
request.bInterfaceClass = kIOUSBFindInterfaceDontCare;
request.bInterfaceSubClass = kIOUSBFindInterfaceDontCare;
request.bInterfaceProtocol = kIOUSBFindInterfaceDontCare;
request.bInterfaceClass = 0xff;
request.bInterfaceSubClass = 0x42;
request.bInterfaceProtocol = 0x03;
request.bAlternateSetting = kIOUSBFindInterfaceDontCare;
// Get an iterator for the interfaces on the device
@ -282,7 +279,6 @@ static int try_device(io_service_t device, usb_handle *handle) {
&plugin, &score);
if ((kr != 0) || (plugin == NULL)) {
ERR("Unable to create a plug-in (%08x)\n", kr);
goto error;
}
@ -436,8 +432,7 @@ static int init_usb(ifc_match_func callback, std::unique_ptr<usb_handle>* handle
if (try_device(device, &h) != 0) {
IOObjectRelease(device);
ret = -1;
break;
continue;
}
if (h.success) {