Snap for 8862780 from ed1fa3ae48 to tm-qpr1-release

Change-Id: I9e7d0e263281917cc27cfef4d7153748cdfb848e
This commit is contained in:
Android Build Coastguard Worker 2022-07-23 03:03:02 +00:00
commit 1e404bff1b
2 changed files with 6 additions and 1 deletions

View file

@ -291,6 +291,9 @@ on init
chown system system /sys/devices/platform/google,cpm/dc_ctl 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 # 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 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 # Power Stats HAL
chown system system /dev/bbd_pwrstat chown system system /dev/bbd_pwrstat

View file

@ -732,7 +732,9 @@ Status getPortStatusHelper(android::hardware::usb::Usb *usb,
// When connected return powerBrickStatus // When connected return powerBrickStatus
if (port.second) { if (port.second) {
string usbType; 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")) { if (strstr(usbType.c_str(), "[D")) {
(*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::CONNECTED; (*currentPortStatus)[i].powerBrickStatus = PowerBrickStatus::CONNECTED;
} else if (strstr(usbType.c_str(), "[U")) { } else if (strstr(usbType.c_str(), "[U")) {