Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UsbDescriptor: Add finite timeout to control transfer"

Browse Source
This commit is contained in:
Jerry Zhang
2018-07-17 19:47:29 +00:00
committed by Gerrit Code Review
parent 1febe4196e 58484d7c69
commit 20dca26f41
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java
View File

@@ -126,6 +126,9 @@ public abstract class UsbDescriptor implements Reporting {
public static final int REQUEST_GET_CONFIGURATION = 0x08; public static final int REQUEST_GET_CONFIGURATION = 0x08;
public static final int REQUEST_SET_CONFIGURATION = 0x09; public static final int REQUEST_SET_CONFIGURATION = 0x09;
// USB control transfer timeout
public static final int USB_CONTROL_TRANSFER_TIMEOUT_MS = 200;
/** /**
* @throws IllegalArgumentException * @throws IllegalArgumentException
*/ */
@@ -224,7 +227,7 @@ public abstract class UsbDescriptor implements Reporting {
0, 0,
sStringBuffer, sStringBuffer,
0xFF, 0xFF,
0); USB_CONTROL_TRANSFER_TIMEOUT_MS);
if (rdo >= 0) { if (rdo >= 0) {
usbStr = new String(sStringBuffer, 2, rdo - 2, "UTF-16LE"); usbStr = new String(sStringBuffer, 2, rdo - 2, "UTF-16LE");
} else { } else {