summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Mclean <pmclean@google.com> 2017-08-01 15:28:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-01 15:28:27 +0000
commitf3562ffdfbb31638297c983221626d94e81ab084 (patch)
treec994d637003b4e3ff33ace31ed7210d3dc75520a
parent040c26f63607119a20be09a0cc8a02f356aa8965 (diff)
parent7d545bef6077d55dcbc3533e416698bf62085d41 (diff)
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
-rw-r--r--services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java22
1 files changed, 14 insertions, 8 deletions
diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
index 303a577767ad..d4a0ac4a0da3 100644
--- a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
+++ b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
@@ -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);
}
}
}