diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-19 01:11:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-19 01:11:22 +0000 |
| commit | 2abe312cb47a5c9d91ae0b6b37a3838f3d959706 (patch) | |
| tree | d16af9c186546b9f3d5d4bc25b36180db6f0b698 | |
| parent | bf0d94ccf9dd38309647c702c609df06d0b4c3cb (diff) | |
| parent | 08de96d5a1b1f3690230078de6aeb291ad2d2c2d (diff) | |
Snap for 10162339 from 08de96d5a1b1f3690230078de6aeb291ad2d2c2d to udc-release
Change-Id: Ibff816724a1f1e1635fe0114cba6e5eb757881d8
| -rw-r--r-- | conf/init.gs101.rc | 4 | ||||
| -rw-r--r-- | usb/usb/Usb.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index a0ed69ee..3ffaad9b 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -749,15 +749,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 diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 7378fc11..6993275a 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -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); |