Snap for 10162339 from ba9adf43a8 to udc-release

Change-Id: Ic5d2bc525c98fa96d9c64dfaa172db05407427a8
This commit is contained in:
Android Build Coastguard Worker 2023-05-19 01:11:25 +00:00
commit 0837e7fa64
2 changed files with 3 additions and 6 deletions

View file

@ -732,15 +732,13 @@ on property:sys.boot_completed=1
# Set ug group
write /proc/vendor_sched/bg_ug 0
write /proc/vendor_sched/sys_ug 0
write /proc/vendor_sched/sysbg_ug 0
write /proc/vendor_sched/ota_ug 0
write /proc/vendor_sched/dex2oat_ug 1
write /proc/vendor_sched/ta_ug 1
# Set bg group throttle
write /proc/vendor_sched/ug_bg_group_throttle 308
# TODO: remove this one after all kernel prebuilts are merged
write /proc/vendor_sched/vug_bg_group_throttle 308
# Set PMU freq limit parameters
write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2

View file

@ -327,7 +327,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;
@ -902,9 +903,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);