Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d23afb59 authored by Keith Mok's avatar Keith Mok Committed by Josh Gao
Browse files

fastboot: Workaround for touchbar hang on MBP 2016 

fastboot will try to set usb configuration on connected
usb devices. When it tries to change the usb configuration
on iBridge device on MBP 2016 model, it hangs, and frozen
the touchbar. Skip set usb configuration.

Bug: https://code.google.com/p/android/issues/detail?id=231129
Change-Id: Ib055fc0524d26092555fc135588fa362e70eeb39
parent a59c7bcc

fastboot/usb_osx.cpp

+0 −8
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 
    HRESULT result;

    SInt32 score;

    UInt8 interfaceNumEndpoints;

    UInt8 configuration;



    // Placing the constant KIOUSBFindInterfaceDontCare into the following

    // fields of the IOUSBFindInterfaceRequest structure will allow us to
@@ -102,13 +101,6 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 
    request.bInterfaceProtocol = kIOUSBFindInterfaceDontCare;

    request.bAlternateSetting = kIOUSBFindInterfaceDontCare;



    // SetConfiguration will kill an existing UMS connection, so let's

    // not do this if not necessary.

    configuration = 0;

    (*dev)->GetConfiguration(dev, &configuration);

    if (configuration != 1)

        (*dev)->SetConfiguration(dev, 1);



    // Get an iterator for the interfaces on the device

    kr = (*dev)->CreateInterfaceIterator(dev, &request, &iterator);