commit b1ab67c8217a54f575c7a226f4f4ebe272827df6
author Linux Build Service Account <lnxbuild@localhost> Tue Jan 03 22:14:19 2023 -0800
committer Linux Build Service Account <lnxbuild@localhost> Tue Jan 03 22:14:19 2023 -0800
tree b6f64794a218c21453e704510d4f7bc53a41a321
parent eede51e3474503057c2a25c25186a174ec2852a2
parent 721d2e2a198247090c59379546af81e83c710321

Merge 721d2e2a198247090c59379546af81e83c710321 on remote branch

Change-Id: I275aab7c4206b31743d3221e0a3e57abff4e54a9

etc/init.qcom.usb.sh

diff --git a/etc/init.qcom.usb.sh b/etc/init.qcom.usb.sh
index aa9cc21..a5ceb48 100644
--- a/etc/init.qcom.usb.sh
+++ b/etc/init.qcom.usb.sh
@@ -97,6 +97,9 @@
 	              "msm8998" | "sdm660" | "apq8098_latv")
 		          setprop persist.vendor.usb.config diag,serial_cdev,rmnet,adb
 		      ;;
+	              "monaco")
+		          setprop persist.vendor.usb.config diag,qdss,rmnet,adb
+		      ;;
 	              "sdm845" | "sdm710")
 		          setprop persist.vendor.usb.config diag,serial_cdev,rmnet,dpl,adb
 		      ;;

hal/Usb.cpp

diff --git a/hal/Usb.cpp b/hal/Usb.cpp
index 8a4afae..083ad73 100644
--- a/hal/Usb.cpp
+++ b/hal/Usb.cpp
@@ -107,17 +107,23 @@
 
 std::string appendRoleNodeHelper(const std::string &portName,
                                  PortRoleType type) {
-  std::string node("/sys/class/typec/" + portName);
 
-  switch (type) {
-    case PortRoleType::DATA_ROLE:
-      return node + "/data_role";
-    case PortRoleType::POWER_ROLE:
-      return node + "/power_role";
-    case PortRoleType::MODE:
-      return node + "/port_type";
-    default:
-      return "";
+    if ((portName == "..") || (portName.find('/') != std::string::npos)) {
+       ALOGE("Fatal: invalid portName");
+       return "";
+    }
+
+    std::string node("/sys/class/typec/" + portName);
+
+    switch (type) {
+      case PortRoleType::DATA_ROLE:
+        return node + "/data_role";
+      case PortRoleType::POWER_ROLE:
+        return node + "/power_role";
+      case PortRoleType::MODE:
+        return node + "/port_type";
+      default:
+        return "";
   }
 }
 
@@ -1058,9 +1064,16 @@
 static bool checkUsbInterfaceAutoSuspend(const std::string& devicePath,
         const std::string &intf) {
   std::string bInterfaceClass;
-  int interfaceClass, ret = -1;
+  int interfaceClass, ret = -1, retry = 3;
 
-  readFile(devicePath + "/" + intf + "/bInterfaceClass", &bInterfaceClass);
+  do {
+	  readFile(devicePath + "/" + intf + "/bInterfaceClass",
+			  &bInterfaceClass);
+  } while ((--retry > 0) && (bInterfaceClass.length() == 0));
+
+  if (bInterfaceClass.length() == 0) {
+	  return false;
+  }
   interfaceClass = std::stoi(bInterfaceClass, 0, 16);
 
   // allow autosuspend for certain class devices