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"

Browse Source 
am: 74458cbdf0

Change-Id: Ie1359f65e2ad72c1567cd426f8eebfc24b053f46
This commit is contained in:
Kamen Kirov
2019-05-07 13:10:26 -07:00
committed by android-build-merger
parent 22f7e515c5 74458cbdf0
commit a05a067674
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 * Audio Class Specific
*/ */
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_INTERFACE: 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; break;
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_ENDPOINT: case UsbDescriptor.DESCRIPTORTYPE_AUDIO_ENDPOINT:
descriptor = UsbACEndpoint.allocDescriptor(this, length, type); if (mDeviceDescriptor.getDevClass() == UsbDescriptor.CLASSID_AUDIO) {
descriptor = UsbACEndpoint.allocDescriptor(this, length, type);
}
break; break;
default: default: