commit 70f441925ad196631a14c522db06a40f1d17118c
author badhri <badhri@google.com> Fri Jul 22 03:15:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 22 03:15:09 2022 +0000
tree b28836ed629ffede9a8aef20b5257a132b564b64
parent 123283fc189f84880abc83e11a589c647b149c2d
parent cee2f409bbd25fd3d93e750c7fff6846d957c012

Set powerBrickStatus to not connected when sourcing power am: 803bb5c4f4 am: cee2f409bb

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19370964

Change-Id: I71043cd724aa213af26f2ccb3b2314ffdb179fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

usb/usb/Usb.cpp

diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 6cff2f2..d3c5036 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -731,7 +731,9 @@
             // 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")) {