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

Merge "Revert "Fix incorrect parsing of UVC interface descriptor"" am: 8863583ffa

Browse Source 
am: 40f44f5d4a

Change-Id: If09ce3e9a5da7a357b883f119bbf2d0ed2385ade
This commit is contained in:
Paul Mclean
2019-05-24 12:30:41 -07:00
committed by android-build-merger
parent 499881f1da 40f44f5d4a
commit e64fd38ce2
1 changed files with 2 additions and 6 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,15 +177,11 @@ public final class UsbDescriptorParser {
* Audio Class Specific
*/
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_INTERFACE:
if (mDeviceDescriptor.getDevClass() == UsbDescriptor.CLASSID_AUDIO) {
descriptor = UsbACInterface.allocDescriptor(this, stream, length, type);
}
descriptor = UsbACInterface.allocDescriptor(this, stream, length, type);
break;
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_ENDPOINT:
if (mDeviceDescriptor.getDevClass() == UsbDescriptor.CLASSID_AUDIO) {
descriptor = UsbACEndpoint.allocDescriptor(this, length, type);
}
descriptor = UsbACEndpoint.allocDescriptor(this, length, type);
break;
default: