commit 84fbc6b6dcf84ef39b9b5de1892d0dab8cb125c9
author Jiabin Huang <jiabin@google.com> Thu Mar 07 00:27:30 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 07 00:27:30 2024 +0000
tree 1e9596d327be9d92e292267b6aa5dfa697185ba7
parent 511dd1695c6e28a91708a52c2595ebbd2cf2dada
parent 66d7513001c4fd16eaead0f3a0322928c1d711ce

Merge "Use the descriptor passed in when adding USB device instead of querying again." into main

services/usb/java/com/android/server/usb/UsbHostManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java
index 8b44579..36adeec 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 @@
             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 @@
                 }
 
                 // Tracking
-                addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT,
-                        parser.getRawDescriptors());
+                addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT, descriptors);
 
                 // Stats collection
                 FrameworkStatsLog.write(FrameworkStatsLog.USB_DEVICE_ATTACHED,