commit 2135d932bf86fb99853c7aedbe3ca4219e4f31f0
author Linux Build Service Account <lnxbuild@localhost> Fri Nov 04 03:55:23 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Nov 04 03:55:23 2022 -0700
tree 5e76a6fae25d4237429df275efcc759946f5a996
parent b09d2b1ac4f4123acacf3ff76d8bd69307c59f85
parent 93576eea98913301f18386035eefcb23935cc32c

Merge 93576eea98913301f18386035eefcb23935cc32c on remote branch

Change-Id: I5f6f0048e61ba486392e061aa4a3f5216c0fba4d

hal/Usb.cpp

diff --git a/hal/Usb.cpp b/hal/Usb.cpp
index e522979..14a9d5f 100644
--- a/hal/Usb.cpp
+++ b/hal/Usb.cpp
@@ -1024,9 +1024,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

hal/UsbGadget.cpp

diff --git a/hal/UsbGadget.cpp b/hal/UsbGadget.cpp
index 3757671..78e73d5 100644
--- a/hal/UsbGadget.cpp
+++ b/hal/UsbGadget.cpp
@@ -233,6 +233,8 @@
 
 Return<void> UsbGadget::getCurrentUsbFunctions(
     const sp<V1_0::IUsbGadgetCallback> &callback) {
+  if (!callback) return Void();
+
   Return<void> ret = callback->getCurrentUsbFunctionsCb(
       mCurrentUsbFunctions, mCurrentUsbFunctionsApplied
                                 ? Status::FUNCTIONS_APPLIED