From 341f0934a27157e8a0e01998ef53a82743da020d Mon Sep 17 00:00:00 2001
From: Paul Mclean <pmclean@google.com>
Date: Fri, 24 May 2019 16:26:39 +0000
Subject: [PATCH] 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
---
 .../server/usb/descriptors/UsbDescriptorParser.java       | 8 ++------
 1 file 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 6a3469c5fa249..e61542824083d 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: