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

Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev

Browse Source 
am: 84a60bf9e8

Change-Id: Ica095cfa4d341916fdb3ab1f9948c693c9471733
This commit is contained in:
Paul McLean
2017-07-13 18:00:55 +00:00
committed by android-build-merger
parent ce58e94a5b 84a60bf9e8
commit 6899fa6c81
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,27 +118,28 @@ public class UsbDescriptorParser {
/**
* @hide
*/
public boolean parseDescriptors(byte[] descriptors) {
try {
mDescriptors.clear();
public void parseDescriptors(byte[] descriptors) {
mDescriptors.clear();
ByteStream stream = new ByteStream(descriptors);
while (stream.available() > 0) {
UsbDescriptor descriptor = allocDescriptor(stream);
if (descriptor != null) {
// Parse
ByteStream stream = new ByteStream(descriptors);
while (stream.available() > 0) {
UsbDescriptor descriptor = allocDescriptor(stream);
if (descriptor != null) {
// Parse
try {
descriptor.parseRawDescriptors(stream);
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);
}
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);