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

Commit b471c510 authored by Kamen Kirov's avatar Kamen Kirov Committed by android-build-merger
Browse files

Merge "Fix incorrect parsing of UVC interface descriptor" am: 74458cbd am: a05a0676 

am: ece7d10d

Change-Id: I033f738f5663f937622d681accc7979ec46fb132
parents 04d064e9 ece7d10d

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -177,11 +177,15 @@ 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: