From 7ebbf913ef090401575738a8d20031745cc12e77 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Sat, 25 Mar 2023 10:25:00 +0000 Subject: [PATCH] Usb: Update UsbDataStatus while being docked Bug: 275150939 Bug: 357028350 Change-Id: I09499642012c7e95bb5a5fef1ac6eb7b8c4e6832 Signed-off-by: Badhri Jagan Sridharan (ported from ag/22273065) Signed-off-by: Kyle Tso --- usb/usb/Usb.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index aedca4e..43f105f 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -996,7 +996,13 @@ Status getPortStatusHelper(android::hardware::usb::Usb *usb, string pogoUsbActive = "0"; if (ReadFileToString(string(kPogoUsbActive), &pogoUsbActive) && stoi(Trim(pogoUsbActive)) == 1) { - (*currentPortStatus)[i].usbDataStatus.push_back(UsbDataStatus::DISABLED_DOCK); + /* + * Always signal USB device mode disabled irrespective of hub enabled while docked. + * Hub gets automatically enabled as needed. Signalling DISABLED_DOCK_HOST_MODE & + * DEVICE_MODE during pogo direct can cause notifications to show for brief windows + * when the state machine is still moving to steady state. + */ + (*currentPortStatus)[i].usbDataStatus.push_back(UsbDataStatus::DISABLED_DOCK_DEVICE_MODE); dataEnabled = false; } if (!usb->mUsbDataEnabled) {