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

Commit 9dd83dc9 authored by Esteban de la Canal's avatar Esteban de la Canal
Browse files

74602: Fixes adb not seeing connected devices on Mac. 

Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html

Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
parent 2c805883

adb/usb_osx.c

+9 −5
Original line number Diff line number Diff line
@@ -513,14 +513,18 @@ int usb_read(usb_handle *handle, void *buf, int len) 
        return -1;

    }



    result =

      (*handle->interface)->ReadPipe(handle->interface,

                                    handle->bulkIn, buf, &numBytes);

    result = (*handle->interface)->ReadPipe(handle->interface, handle->bulkIn, buf, &numBytes);



    if (0 == result)

    if (kIOUSBPipeStalled == result) {

        DBG(" Pipe stalled, clearing stall.\n");

        (*handle->interface)->ClearPipeStall(handle->interface, handle->bulkIn);

        result = (*handle->interface)->ReadPipe(handle->interface, handle->bulkIn, buf, &numBytes);

    }



    if (kIOReturnSuccess == result)

        return 0;

    else {

        DBG("ERR: usb_read failed with status %d\n", result);

        DBG("ERR: usb_read failed with status %x\n", result);

    }



    return -1;