From 7ebbf913ef090401575738a8d20031745cc12e77 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Sat, 25 Mar 2023 10:25:00 +0000 Subject: [PATCH 1/3] 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) { From f16ad492442360d5d6c6f6fb89e2806134ea2a92 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Mon, 31 Jan 2022 15:57:24 -0800 Subject: [PATCH 2/3] Rename enable_usb dev node to move_data_to_usb kernel dev attribute has now been renamed from enable_usb to move_data_to_usb. Update the same. Bug: 251381400 Bug: 357028350 Flag: EXEMPT bugfix Signed-off-by: Badhri Jagan Sridharan Change-Id: I8e4aa0b2e09bfef807f0169eabb79e2fa2e4d2c7 (ported from ag/20309232) Signed-off-by: Kyle Tso --- usb/usb/Usb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 43f105f..4202407 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -103,8 +103,8 @@ constexpr char kThermalZoneForTempReadSecondary1[] = "usb_pwr_therm"; constexpr char kThermalZoneForTempReadSecondary2[] = "qi_therm"; constexpr char kPogoUsbActive[] = "/sys/devices/platform/google,pogo/pogo_usb_active"; constexpr char kPogoEnableHub[] = "/sys/devices/platform/google,pogo/enable_hub"; -constexpr char kPogoEnableUsb[] = "/sys/devices/platform/google,pogo/enable_usb"; constexpr char kInternalHubDevnum[] = "/sys/bus/usb/devices/1-1/devnum"; +constexpr char KPogoMoveDataToUsb[] = "/sys/devices/platform/google,pogo/move_data_to_usb"; constexpr char kPowerSupplyUsbType[] = "/sys/class/power_supply/usb/usb_type"; constexpr char kIrqHpdCount[] = "irq_hpd_count"; constexpr char kUdcUeventRegex[] = @@ -245,12 +245,12 @@ ScopedAStatus Usb::enableUsbDataWhileDocked(const string& in_portName, ALOGI("Userspace enableUsbDataWhileDocked opID:%ld", in_transactionId); int flags = O_RDONLY; - ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(kPogoEnableUsb, flags))); + ::android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(KPogoMoveDataToUsb, flags))); if (fd != -1) { notSupported = false; - success = WriteStringToFile("1", kPogoEnableUsb); + success = WriteStringToFile("1", KPogoMoveDataToUsb); if (!success) { - ALOGE("Write to enable_usb failed"); + ALOGE("Write to move_data_to_usb failed"); } } From 56e949cdce6dc788ee1c1eb75d9a040a97ddc77b Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Fri, 30 Aug 2024 08:55:46 +0000 Subject: [PATCH 3/3] Revert "16kb: Verify that zumapro prebuilts are 16kb compatible" This reverts commit a5372bac754b486d0e140a54ccd744c36be78c92. Reason for revert: Build break. Bug: 363170018 Bug: 363170018 Bug: 363816648 Change-Id: I1a0d7ad852b375e77aa6c8fff0112e9c1014a56e --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index c454833..75c16f6 100644 --- a/device.mk +++ b/device.mk @@ -1277,4 +1277,3 @@ PRODUCT_PRODUCT_PROPERTIES += \ dumpstate.strict_run=false PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true