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""

Browse Source 
am: 8863583ffa

Change-Id: Ifb74f24bba3160b7111c5d03f1a0a646592f53ae
This commit is contained in:
Paul Mclean
2019-05-24 11:57:56 -07:00
committed by android-build-merger
parent 2d525eece3 8863583ffa
commit 40f44f5d4a
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 * Audio Class Specific
*/ */
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_INTERFACE: 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; break;
case UsbDescriptor.DESCRIPTORTYPE_AUDIO_ENDPOINT: case UsbDescriptor.DESCRIPTORTYPE_AUDIO_ENDPOINT:
if (mDeviceDescriptor.getDevClass() == UsbDescriptor.CLASSID_AUDIO) { descriptor = UsbACEndpoint.allocDescriptor(this, length, type);
descriptor = UsbACEndpoint.allocDescriptor(this, length, type);
}
break; break;
default: default: