diff options
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbHostManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java index 8b44579eda33..36adeec74e36 100644 --- a/services/usb/java/com/android/server/usb/UsbHostManager.java +++ b/services/usb/java/com/android/server/usb/UsbHostManager.java @@ -380,6 +380,11 @@ public class UsbHostManager { return false; } + if (descriptors == null) { + Slog.e(TAG, "Failed to add device as the descriptor is null"); + return false; + } + UsbDescriptorParser parser = new UsbDescriptorParser(deviceAddress, descriptors); if (deviceClass == UsbConstants.USB_CLASS_PER_INTERFACE && !checkUsbInterfacesDenyListed(parser)) { @@ -462,8 +467,7 @@ public class UsbHostManager { } // Tracking - addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT, - parser.getRawDescriptors()); + addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT, descriptors); // Stats collection FrameworkStatsLog.write(FrameworkStatsLog.USB_DEVICE_ATTACHED, |