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

Commit dc9d52f3 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

adb: Use correct language ID when retrieving USB serial number. 

Fixes http://code.google.com/p/android/issues/detail?id=2609



Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 417a3235

adb/usb_linux.c

+32 −12
Original line number Diff line number Diff line
@@ -269,15 +269,33 @@ static int find_usb_device(const char *base, 
                    if (device->iSerialNumber) {

                        struct usbdevfs_ctrltransfer  ctrl;

                        __u16 buffer[128];

                        int result;

                        __u16 languages[128];

                        int i, result;

                        int languageCount = 0;



                        memset(languages, 0, sizeof(languages));

                        memset(&ctrl, 0, sizeof(ctrl));



                            // read list of supported languages

                        ctrl.bRequestType = USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE;

                        ctrl.bRequest = USB_REQ_GET_DESCRIPTOR;

                        ctrl.wValue = (USB_DT_STRING << 8) | 0;

                        ctrl.wIndex = 0;

                        ctrl.wLength = sizeof(languages);

                        ctrl.data = languages;



                        result = ioctl(fd, USBDEVFS_CONTROL, &ctrl);

                        if (result > 0)

                            languageCount = (result - 2) / 2;



                        for (i = 1; i <= languageCount; i++) {

                            memset(buffer, 0, sizeof(buffer));

                            memset(&ctrl, 0, sizeof(ctrl));



                            ctrl.bRequestType = USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE;

                            ctrl.bRequest = USB_REQ_GET_DESCRIPTOR;

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

                        ctrl.wIndex = 0;

                            ctrl.wIndex = languages[i];

                            ctrl.wLength = sizeof(buffer);

                            ctrl.data = buffer;
@@ -289,6 +307,8 @@ static int find_usb_device(const char *base, 
                                for (i = 1; i < result; i++)

                                    serial[i - 1] = buffer[i];

                                serial[i - 1] = 0;

                                break;

                            }

                        }

                    }