From 1e3b4431f4d60c0e69d3d97b3c74f85663c50d4a 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 Change-Id: I09499642012c7e95bb5a5fef1ac6eb7b8c4e6832 Signed-off-by: Badhri Jagan Sridharan --- 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 3e4f8a12..617b3f2e 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -777,7 +777,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) {