Snap for 8863164 from 1d1a9e5a36 to udc-release

Change-Id: Id22cc390c82372b1205f076521085cb27ce1a29e
This commit is contained in:
Android Build Coastguard Worker 2022-07-23 05:08:11 +00:00
commit da41bb2c8d
2 changed files with 6 additions and 1 deletions

View file

@ -299,6 +299,9 @@ on init
chown system system /sys/devices/platform/google,cpm/dc_ctl
# Important to include dd_state as it's used in battery defender in charger mode
chown system system /sys/devices/platform/google,charger/dd_state
# Disable dock-defend by default
chown system system /sys/devices/platform/google,charger/dd_settings
write /sys/devices/platform/google,charger/dd_settings -1
# Power Stats HAL
chown system system /dev/bbd_pwrstat

View file

@ -731,7 +731,9 @@ Status getPortStatusHelper(android::hardware::usb::Usb *usb,
// When connected return powerBrickStatus
if (port.second) {
string usbType;
if (ReadFileToString(string(kPowerSupplyUsbType), &usbType)) {
if ((*currentPortStatus)[i].currentPowerRole == PortPowerRole::SOURCE) {
(*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::NOT_CONNECTED;
} else if (ReadFileToString(string(kPowerSupplyUsbType), &usbType)) {
if (strstr(usbType.c_str(), "[D")) {
(*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::CONNECTED;
} else if (strstr(usbType.c_str(), "[U")) {