Merge "More fine-grained exception handling so we can still use non-excepting... (84a60bf9) · Commits · e / os / android_frameworks_base

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

+23 −18

Original line number	Diff line number	Diff line
		@@ -118,8 +118,7 @@ public class UsbDescriptorParser {
		/**
		* @hide
		*/
		public boolean parseDescriptors(byte[] descriptors) {
		try {
		public void parseDescriptors(byte[] descriptors) {
		mDescriptors.clear();

		ByteStream stream = new ByteStream(descriptors);
		@@ -127,18 +126,20 @@ public class UsbDescriptorParser {
		UsbDescriptor descriptor = allocDescriptor(stream);
		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.
		mDescriptors.add(descriptor);

		// Clean up
		descriptor.postParse(stream);
		}
		}
		return true;
		} catch (Exception ex) {
		Log.e(TAG, "Exception parsing USB descriptors.", ex);
		}
		return false;
		}

		/**
		@@ -146,7 +147,11 @@ public class UsbDescriptorParser {
		*/
		public boolean parseDevice(String deviceAddr) {
		byte[] rawDescriptors = getRawDescriptors(deviceAddr);
		return rawDescriptors != null && parseDescriptors(rawDescriptors);
		if (rawDescriptors != null) {
		parseDescriptors(rawDescriptors);
		return true;
		}
		return false;
		}

		private native byte[] getRawDescriptors(String deviceAddr);