From 7d34263bf91c8a77d1e5663dcdc8a1836a27c192 Mon Sep 17 00:00:00 2001 From: badhri Date: Thu, 21 Jul 2022 00:49:59 +0000 Subject: [PATCH 1/2] Set powerBrickStatus to not connected when sourcing power Bug: 239755044 Signed-off-by: Badhri Jagan Sridharan Change-Id: I7720bfaa5876c058643c52525b488ba22b3e5121 --- usb/usb/Usb.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 82f6e184..d7227840 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -732,7 +732,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")) { From ed1fa3ae483beb6b0ef404b83ec79de5e0559c70 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Thu, 21 Jul 2022 16:34:37 +0800 Subject: [PATCH 2/2] init: disable dock-defend User will enable/disable this feature from UI setting Bug: 239889098 Test: dock-defend is disabled by default Signed-off-by: Jack Wu Change-Id: I1b0dd49208f345d4edeee81f9b07d2de93f97d45 --- conf/init.gs201.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 35d9cd66..4bc1497e 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -291,6 +291,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