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

Snap for 10157673 from 1d3be78834 to udc-qpr1-release

Browse source 
Change-Id: Ifa958245e587b3ad4cb47053d6d9f50463eab1fe
This commit is contained in:
Android Build Coastguard Worker 2023-05-18 03:02:11 +00:00
commit 0dd7671041
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
usb/usb/Usb.cpp
View file

@ -327,7 +327,8 @@ Status queryNonCompliantChargerStatus(std::vector<PortStatus> *currentPortStatus
continue; continue;
} }
} }
if ((*currentPortStatus)[i].complianceWarnings.size() > 0) { if ((*currentPortStatus)[i].complianceWarnings.size() > 0 &&
(*currentPortStatus)[i].currentPowerRole == PortPowerRole::NONE) {
(*currentPortStatus)[i].currentMode = PortMode::UFP; (*currentPortStatus)[i].currentMode = PortMode::UFP;
(*currentPortStatus)[i].currentPowerRole = PortPowerRole::SINK; (*currentPortStatus)[i].currentPowerRole = PortPowerRole::SINK;
(*currentPortStatus)[i].currentDataRole = PortDataRole::NONE; (*currentPortStatus)[i].currentDataRole = PortDataRole::NONE;
@ -902,9 +903,7 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
status = getPortStatusHelper(usb, currentPortStatus); status = getPortStatusHelper(usb, currentPortStatus);
queryMoistureDetectionStatus(currentPortStatus); queryMoistureDetectionStatus(currentPortStatus);
queryPowerTransferStatus(currentPortStatus); queryPowerTransferStatus(currentPortStatus);
#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */
queryNonCompliantChargerStatus(currentPortStatus); queryNonCompliantChargerStatus(currentPortStatus);
#endif
if (usb->mCallback != NULL) { if (usb->mCallback != NULL) {
ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus, ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
status); status);