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

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

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection... 

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am: f3562ffd

Change-Id: I7af6e0b15e2a09c636a2d540714bfc5dd2d459f9
parents 8d2fceae f3562ffd

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

+14 −8
Original line number Diff line number Diff line
@@ -123,14 +123,17 @@ public class UsbDescriptorParser { 


        ByteStream stream = new ByteStream(descriptors);

        while (stream.available() > 0) {

            UsbDescriptor descriptor = allocDescriptor(stream);

            UsbDescriptor descriptor = null;

            try {

                descriptor = allocDescriptor(stream);

            } catch (Exception ex) {

                Log.e(TAG, "Exception allocating USB descriptor.", ex);

            }



            if (descriptor != null) {

                // Parse

                try {

                    descriptor.parseRawDescriptors(stream);

                } catch (Exception ex) {

                    Log.e(TAG, "Exception parsing USB descriptors.", ex);

                }



                    // Its OK to add the invalid descriptor as the postParse()

                    // routine will mark it as invalid.
@@ -138,6 +141,9 @@ public class UsbDescriptorParser { 


                    // Clean up

                    descriptor.postParse(stream);

                } catch (Exception ex) {

                    Log.e(TAG, "Exception parsing USB descriptors.", ex);

                }

            }

        }

    }