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

Commit 0458d373 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "fastboot: set the language local string"

parents 149ae11f c840653e

fastboot/usb_linux.c

+3 −2
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ static int filter_usb_device(int fd, char *ptr, int len, int writable, 
        ctrl.bRequestType = USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE;

        ctrl.bRequest = USB_REQ_GET_DESCRIPTOR;

        ctrl.wValue = (USB_DT_STRING << 8) | dev->iSerialNumber;

        ctrl.wIndex = 0;

        //language ID (en-us) for serial number string

        ctrl.wIndex = 0x0409;

        ctrl.wLength = sizeof(buffer);

        ctrl.data = buffer;

        ctrl.timeout = 50;

fastboot/usb_osx.c

+2 −1
Original line number Diff line number Diff line
@@ -331,7 +331,8 @@ static int try_device(io_service_t device, usb_handle *handle) { 
        req.bmRequestType = USBmakebmRequestType(kUSBIn, kUSBStandard, kUSBDevice);

        req.bRequest = kUSBRqGetDescriptor;

        req.wValue = (kUSBStringDesc << 8) | serialIndex;

        req.wIndex = 0;

        //language ID (en-us) for serial number string

        req.wIndex = 0x0409;

        req.pData = buffer;

        req.wLength = sizeof(buffer);

        kr = (*dev)->DeviceRequest(dev, &req);