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

Commit 22d4bf22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Catch exception in descriptor parser causes device connection to be... 

Merge "Catch exception in descriptor parser causes device connection to be skipped." into oc-dr1-dev
parents 150fec44 b82963f3

services/usb/java/com/android/server/usb/UsbHostManager.java

+8 −4
Original line number Diff line number Diff line
@@ -261,12 +261,16 @@ public class UsbHostManager { 
                }

                // deviceName is something like: "/dev/bus/usb/001/001"

                UsbDescriptorParser parser = new UsbDescriptorParser();

                boolean isInputHeadset = false;

                boolean isOutputHeadset = false;

                if (parser.parseDevice(mNewDevice.getDeviceName())) {

                    Slog.i(TAG, "---- isHeadset[in:" + parser.isInputHeadset()

                            + " , out:" + parser.isOutputHeadset() + "]");

                    mUsbAlsaManager.usbDeviceAdded(mNewDevice,

                            parser.isInputHeadset(), parser.isOutputHeadset());

                    isInputHeadset = parser.isInputHeadset();

                    isOutputHeadset = parser.isOutputHeadset();

                    Slog.i(TAG, "---- isHeadset[in:" + isInputHeadset

                            + " , out:" + isOutputHeadset + "]");

                }

                mUsbAlsaManager.usbDeviceAdded(mNewDevice,

                        isInputHeadset, isOutputHeadset);

            } else {

                Slog.e(TAG, "mNewDevice is null in endUsbDeviceAdded");

            }