summaryrefslogtreecommitdiff
path: root/services/usb/java
diff options
context:
space:
mode:
authorPaul Mclean <pmclean@google.com>2019-05-24 16:26:39 +0000
committerPaul Mclean <pmclean@google.com>2019-05-24 17:34:32 +0000
commit341f0934a27157e8a0e01998ef53a82743da020d (patch)
tree4f0a9fdeda1cd8907849fc299d53ba7759c76664 /services/usb/java
parentb83cf0c7f14a05a4ba9fef5aa0f95cdb75bc9b28 (diff)
Revert "Fix incorrect parsing of UVC interface descriptor"
This reverts commit b83cf0c7f14a05a4ba9fef5aa0f95cdb75bc9b28. Reason for revert: This changes breaks connection to ALL USB Audio interface. Camera audio should be investigat Bug: 124374863 Bug: 133501871 Change-Id: I19fed05c0b5f4227f88df3ac17ddd5ebe4246f3d
Diffstat (limited to 'services/usb/java')
-rw-r--r--services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
index 6a3469c5fa24..e61542824083 100644
--- a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
+++ b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
@@ -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: