diff options
| author | 2018-07-17 13:59:15 -0700 | |
|---|---|---|
| committer | 2018-07-17 13:59:15 -0700 | |
| commit | 4bff76be8058a0c2948836b4fd01b35bb57e9f86 (patch) | |
| tree | ffdfb6fa3c735d352a035cd5b91229e3e06237be | |
| parent | 8f66efbffe60943d712136f3a1cc71b487d38a53 (diff) | |
| parent | 20dca26f41ef1b9097c2e7112cb641f21e6806f4 (diff) | |
Merge "UsbDescriptor: Add finite timeout to control transfer"
am: 20dca26f41
Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
| -rw-r--r-- | services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java index 3fc5fe320574..ff67667e848d 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java @@ -126,6 +126,9 @@ public abstract class UsbDescriptor implements Reporting { public static final int REQUEST_GET_CONFIGURATION = 0x08; public static final int REQUEST_SET_CONFIGURATION = 0x09; + // USB control transfer timeout + public static final int USB_CONTROL_TRANSFER_TIMEOUT_MS = 200; + /** * @throws IllegalArgumentException */ @@ -224,7 +227,7 @@ public abstract class UsbDescriptor implements Reporting { 0, sStringBuffer, 0xFF, - 0); + USB_CONTROL_TRANSFER_TIMEOUT_MS); if (rdo >= 0) { usbStr = new String(sStringBuffer, 2, rdo - 2, "UTF-16LE"); } else { |