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

Snap for 10157673 from 18dca4e3f7 to udc-qpr1-release

Browse source 
Change-Id: I6e8798a084df55966f3a264c486654d4bdb248d3
This commit is contained in:
Android Build Coastguard Worker 2023-05-18 03:02:09 +00:00
commit 587450e68c
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
device.mk
View file

@ -250,7 +250,7 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.opengles.version=196610 \ ro.opengles.version=196610 \
graphics.gpu.profiler.support=true \ graphics.gpu.profiler.support=true \
debug.renderengine.backend=skiavkthreaded debug.renderengine.backend=skiaglthreaded
# GRAPHICS - GPU (end) # GRAPHICS - GPU (end)
# #################### # ####################

5
usb/usb/Usb.cpp
View file

@ -312,7 +312,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;
@ -819,9 +820,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);