Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 11257657 from 5e14ba01be to 24Q2-release

Browse source 
Change-Id: I43696ab3accd73fef8b394c82dba6b41345c7168
This commit is contained in:
Android Build Coastguard Worker 2023-12-28 00:02:35 +00:00
commit 42fb3e2826
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
usb/usb/UsbDataSessionMonitor.cpp
View file

@ -52,11 +52,6 @@ namespace usb {
#define WARNING_SURFACE_DELAY_SEC 5 #define WARNING_SURFACE_DELAY_SEC 5
#define ENUM_FAIL_DEFAULT_COUNT_THRESHOLD 3 #define ENUM_FAIL_DEFAULT_COUNT_THRESHOLD 3
#define DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD 5 #define DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD 5
/*
* Typically a smooth and successful enumeration in device mode would go through 5 states at
* maximum: not attached -> default -> default -> addressed -> configured
*/
#define DEVICE_STATE_TRANSITION_PER_ENUMERATION 5
constexpr char kUdcConfigfsPath[] = "/config/usb_gadget/g1/UDC"; constexpr char kUdcConfigfsPath[] = "/config/usb_gadget/g1/UDC";
constexpr char kNotAttachedState[] = "not attached\n"; constexpr char kNotAttachedState[] = "not attached\n";
@ -250,7 +245,6 @@ void UsbDataSessionMonitor::evaluateComplianceWarning() {
if (elapsedTimeSec >= WARNING_SURFACE_DELAY_SEC) { if (elapsedTimeSec >= WARNING_SURFACE_DELAY_SEC) {
if (mDataRole == PortDataRole::DEVICE && mUdcBind) { if (mDataRole == PortDataRole::DEVICE && mUdcBind) {
int stateCount = mDeviceState.states.size();
int configuredCount = std::count(mDeviceState.states.begin(), int configuredCount = std::count(mDeviceState.states.begin(),
mDeviceState.states.end(), kConfiguredState); mDeviceState.states.end(), kConfiguredState);
int defaultCount = int defaultCount =
@ -259,12 +253,8 @@ void UsbDataSessionMonitor::evaluateComplianceWarning() {
if (configuredCount == 0 && defaultCount > ENUM_FAIL_DEFAULT_COUNT_THRESHOLD) if (configuredCount == 0 && defaultCount > ENUM_FAIL_DEFAULT_COUNT_THRESHOLD)
newWarningSet.insert(ComplianceWarning::ENUMERATION_FAIL); newWarningSet.insert(ComplianceWarning::ENUMERATION_FAIL);
if (configuredCount > DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD && if (configuredCount > DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD)
stateCount > configuredCount * DEVICE_STATE_TRANSITION_PER_ENUMERATION) {
ALOGI("Detected flaky connection: state count %d, configured count %d",
stateCount, configuredCount);
newWarningSet.insert(ComplianceWarning::FLAKY_CONNECTION); newWarningSet.insert(ComplianceWarning::FLAKY_CONNECTION);
}
} else if (mDataRole == PortDataRole::HOST) { } else if (mDataRole == PortDataRole::HOST) {
int host1StateCount = mHost1State.states.size(); int host1StateCount = mHost1State.states.size();
int host1ConfiguredCount = int host1ConfiguredCount =