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

Commit b35ee228 authored by Josh Gao's avatar Josh Gao
Browse files

adb: pin USB interface versions on darwin. 

It's possible to build against an SDK that's newer than the OS that
we're actually running via Xcode update, and Apple increments the
unversioned IOKit interface IDs to the newest version on every release,
which leads to mysterious failures to acquire an interface.

Pin the interface versions to IOUSBFamily 5.0.0, which shipped on OS X
10.7.3.

Bug: http://b/119264733
Test: ./test_device.py
Change-Id: Id26760bc62c89a1f7ef67511b21f9d9252ab69f3
parent 31859150

adb/client/usb_osx.cpp

+4 −4
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ AndroidInterfaceAdded(io_iterator_t iterator) 
    io_service_t             usbDevice;

    io_service_t             usbInterface;

    IOCFPlugInInterface      **plugInInterface = NULL;

    IOUSBInterfaceInterface220  **iface = NULL;

    IOUSBDeviceInterface197  **dev = NULL;

    IOUSBInterfaceInterface500  **iface = NULL;

    IOUSBDeviceInterface500  **dev = NULL;

    HRESULT                  result;

    SInt32                   score;

    uint32_t                 locationId;
@@ -163,7 +163,7 @@ AndroidInterfaceAdded(io_iterator_t iterator) 
        //* This gets us the interface object

        result = (*plugInInterface)->QueryInterface(

            plugInInterface,

            CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID), (LPVOID*)&iface);

            CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID500), (LPVOID*)&iface);

        //* We only needed the plugin to get the interface, so discard it

        (*plugInInterface)->Release(plugInInterface);

        if (result || !iface) {
@@ -209,7 +209,7 @@ AndroidInterfaceAdded(io_iterator_t iterator) 
        }



        result = (*plugInInterface)->QueryInterface(plugInInterface,

            CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID), (LPVOID*)&dev);

            CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID500), (LPVOID*)&dev);

        //* only needed this to query the plugin

        (*plugInInterface)->Release(plugInInterface);

        if (result || !dev) {