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

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

Browse Source 
am: f3562ffdfb

Change-Id: I0304bf7c72a340f4bebebea89d2e934ae5830b33
This commit is contained in:
Paul Mclean
2017-08-01 15:35:05 +00:00
committed by android-build-merger
parent 08674f3a25 f3562ffdfb
commit 18d64cf8fe
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
View File

@@ -123,21 +123,27 @@ 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);
// Its OK to add the invalid descriptor as the postParse()
// routine will mark it as invalid.
mDescriptors.add(descriptor);
// Clean up
descriptor.postParse(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.
mDescriptors.add(descriptor);
// Clean up
descriptor.postParse(stream);
}
}
}