Snap for 11973804 from c5a560160f to 24Q3-release

Change-Id: Ibb3db4c1bf7c9dc3829ea2e720d6cb89b8485742
This commit is contained in:
Android Build Coastguard Worker 2024-06-15 01:02:07 +00:00
commit f6fed95fe1
2 changed files with 7 additions and 0 deletions

View file

@ -593,6 +593,11 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role
fp = fopen(filename.c_str(), "w"); fp = fopen(filename.c_str(), "w");
if (fp != NULL) { if (fp != NULL) {
int ret = fputs(convertRoletoString(in_role).c_str(), fp); int ret = fputs(convertRoletoString(in_role).c_str(), fp);
if (ret == EAGAIN) {
ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS);
std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS));
ret = fputs(convertRoletoString(in_role).c_str(), fp);
}
fclose(fp); fclose(fp);
if ((ret != EOF) && ReadFileToString(filename, &written)) { if ((ret != EOF) && ReadFileToString(filename, &written)) {
written = Trim(written); written = Trim(written);

View file

@ -55,6 +55,8 @@ constexpr char kGadgetName[] = "11110000.dwc3";
#define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess" #define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess"
#define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled" #define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled"
#define ROLE_SWAP_RETRY_MS 700
struct Usb : public BnUsb { struct Usb : public BnUsb {
Usb(); Usb();