Snap for 10157673 from 18dca4e3f7
to udc-qpr1-release
Change-Id: I6e8798a084df55966f3a264c486654d4bdb248d3
This commit is contained in:
commit
587450e68c
2 changed files with 3 additions and 4 deletions
|
@ -250,7 +250,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.opengles.version=196610 \
|
||||
graphics.gpu.profiler.support=true \
|
||||
debug.renderengine.backend=skiavkthreaded
|
||||
debug.renderengine.backend=skiaglthreaded
|
||||
|
||||
# GRAPHICS - GPU (end)
|
||||
# ####################
|
||||
|
|
|
@ -312,7 +312,8 @@ Status queryNonCompliantChargerStatus(std::vector<PortStatus> *currentPortStatus
|
|||
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].currentPowerRole = PortPowerRole::SINK;
|
||||
(*currentPortStatus)[i].currentDataRole = PortDataRole::NONE;
|
||||
|
@ -819,9 +820,7 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
|
|||
status = getPortStatusHelper(usb, currentPortStatus);
|
||||
queryMoistureDetectionStatus(currentPortStatus);
|
||||
queryPowerTransferStatus(currentPortStatus);
|
||||
#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */
|
||||
queryNonCompliantChargerStatus(currentPortStatus);
|
||||
#endif
|
||||
if (usb->mCallback != NULL) {
|
||||
ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
|
||||
status);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue