commit da8c653b879cc19ad784289c8ba7cdb0d41befd5
author Linux Build Service Account <lnxbuild@localhost> Mon Jan 22 02:17:09 2024 -0800
committer Linux Build Service Account <lnxbuild@localhost> Mon Jan 22 02:17:09 2024 -0800
tree a3c3a8c1c1cb99a169965bfd0ae719569055fe68
parent 55b8ab412e37eaf5592ac27a51c53125bd1d3015
parent 10f7eda34d4de1a238d272712f5d622f9cd549db

Merge 10f7eda34d4de1a238d272712f5d622f9cd549db on remote branch

Change-Id: Ifcb2349ec3c6fe94a9ab072f13a5cedcf0a5066a

hal/Usb.cpp

diff --git a/hal/Usb.cpp b/hal/Usb.cpp
index 418f43c..ea45862 100644
--- a/hal/Usb.cpp
+++ b/hal/Usb.cpp
@@ -1099,7 +1099,7 @@
 
 static bool checkUsbInterfaceAutoSuspend(const std::string& devicePath,
         const std::string &intf) {
-  std::string bInterfaceClass;
+  std::string bInterfaceClass = "";
   int interfaceClass, ret = -1, retry = 3;
 
   do {

vendor_product.mk

diff --git a/vendor_product.mk b/vendor_product.mk
index 50ec37a..4b0a2cb 100644
--- a/vendor_product.mk
+++ b/vendor_product.mk
@@ -9,7 +9,7 @@
 
 ifneq ($(filter bengal monaco trinket,$(TARGET_BOARD_PLATFORM)),)
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.controller=4e00000.dwc3
-  ifneq ($(filter bengal,$(TARGET_BOARD_PLATFORM)),)
+  ifneq ($(filter bengal trinket,$(TARGET_BOARD_PLATFORM)),)
     PRODUCT_SYSTEM_PROPERTIES += ro.boot.usb.dwc3_msm=4e00000.ssusb
   else
     PRODUCT_SYSTEM_PROPERTIES += ro.boot.usb.dwc3_msm=4e00000.hsusb
@@ -19,7 +19,7 @@
 endif
 
 # QDSS uses SW path on these targets
-ifneq ($(filter lahaina taro bengal kalama monaco kona crow,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter lahaina taro bengal kalama monaco kona crow trinket,$(TARGET_BOARD_PLATFORM)),)
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss_sw
 else
   PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss