Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e64fd38c authored by Paul Mclean's avatar Paul Mclean Committed by android-build-merger
Browse files

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

am: 40f44f5d

Change-Id: If09ce3e9a5da7a357b883f119bbf2d0ed2385ade
parents 499881f1 40f44f5d

services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java

+2 −6
Original line number Diff line number Diff line
@@ -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);

                }

                break;



            case UsbDescriptor.DESCRIPTORTYPE_AUDIO_ENDPOINT:

                if (mDeviceDescriptor.getDevClass() == UsbDescriptor.CLASSID_AUDIO) {

                descriptor = UsbACEndpoint.allocDescriptor(this, length, type);

                }

                break;



            default: