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" am: 20dca26f41

Browse Source 
am: 4bff76be80

Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568
This commit is contained in:
Jerry Zhang
2018-07-17 15:00:31 -07:00
committed by android-build-merger
parent 7f05ea78dd 4bff76be80
commit db3a291e9d
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_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 {