Snap for 11973804 from d17fdff5f8 to 24Q3-release

Change-Id: I8b384c229281b36e39d2361148e093d81c48593f
This commit is contained in:
Android Build Coastguard Worker 2024-06-15 01:03:32 +00:00
commit 5cc832e4e7
2 changed files with 3 additions and 1 deletions

View file

@ -603,7 +603,8 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role
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) { if (ret == EAGAIN) {
std::this_thread::sleep_for(std::chrono::milliseconds(700)); 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); ret = fputs(convertRoletoString(in_role).c_str(), fp);
} }
fclose(fp); fclose(fp);

View file

@ -79,6 +79,7 @@ constexpr char kGadgetName[] = "11210000.dwc3";
#define DISPLAYPORT_IRQ_HPD_COUNT_CHECK 3 #define DISPLAYPORT_IRQ_HPD_COUNT_CHECK 3
#define DISPLAYPORT_POLL_WAIT_MS 100 #define DISPLAYPORT_POLL_WAIT_MS 100
#define ROLE_SWAP_RETRY_MS 700
#define SVID_DISPLAYPORT "ff01" #define SVID_DISPLAYPORT "ff01"
#define SVID_THUNDERBOLT "8087" #define SVID_THUNDERBOLT "8087"