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

Merge "Fix incorrect parsing of UVC interface descriptor" am: 74458cbdf0

Browse Source 
am: a05a067674

Change-Id: I55d4804312a1d127b7fff0683902e30c7fa06e90
This commit is contained in:
Kamen Kirov
2019-05-07 13:43:55 -07:00
committed by android-build-merger
parent c29d0dcafc a05a067674
commit ece7d10d85
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
View File

@@ -177,11 +177,15 @@ public final class UsbDescriptorParser {
* Audio Class Specific
*/
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_INTERFACE:
descriptor = UsbACInterface.allocDescriptor(this, stream, length, type);
if (mDeviceDescriptor.getDevClass() == UsbDescriptor.CLASSID_AUDIO) {
descriptor = UsbACInterface.allocDescriptor(this, stream, length, type);
}
break;
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_ENDPOINT:
descriptor = UsbACEndpoint.allocDescriptor(this, length, type);
if (mDeviceDescriptor.getDevClass() == UsbDescriptor.CLASSID_AUDIO) {
descriptor = UsbACEndpoint.allocDescriptor(this, length, type);
}
break;
default: