Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-11 00:46:11 +00:00
committed by Android (Google) Code Review
parent 150fec445a b82963f3e0
commit 22d4bf2283
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/usb/java/com/android/server/usb/UsbHostManager.java
View File

@@ -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");
}