From 190f88847ca9f51748cc8b9b28bb0dca6afae1bd Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Tue, 16 May 2023 16:51:57 +0000 Subject: [PATCH 1/3] gs101: Use SkiaGL as RenderEngine backend This reverts commit 6968365b28142e601a8d65575ad9f7c76208773c. Reason for revert: b/281967184 and b/280343156 Even though using SkiaVK with RenderEngine has definite benefits, it appears to need more "soak time" in order to squeeze out some functional bugs. Test: none-returning RenderEngine to using SkiaGL, as it was before Bug: 281967184 Bug: 280343156 Change-Id: Iaea0d102e9f99337622ef116ce0dc921c0394c4c --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 829e6a39..0ab5fc64 100644 --- a/device.mk +++ b/device.mk @@ -250,7 +250,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ graphics.gpu.profiler.support=true \ - debug.renderengine.backend=skiavkthreaded + debug.renderengine.backend=skiaglthreaded # GRAPHICS - GPU (end) # #################### From 4c74d00f9811436024c6c0d452d3e487a227e086 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Fri, 12 May 2023 02:02:13 +0000 Subject: [PATCH 2/3] Revert "usb: Temporarily disable compliance warning" This reverts commit f178319b4a867eb9b1e0fe898ef8933bd3c55303. Bug: 279251052 Change-Id: Ic67b94da213357af05a5c6e14e15946a02af7fba --- usb/usb/Usb.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 7378fc11..74f6868c 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -819,9 +819,7 @@ void queryVersionHelper(android::hardware::usb::Usb *usb, status = getPortStatusHelper(usb, currentPortStatus); queryMoistureDetectionStatus(currentPortStatus); queryPowerTransferStatus(currentPortStatus); -#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */ queryNonCompliantChargerStatus(currentPortStatus); -#endif if (usb->mCallback != NULL) { ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus, status); From cac33c008f80e309ceaeef399e2ca4b46e2c0e2f Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Tue, 16 May 2023 03:52:41 +0000 Subject: [PATCH 3/3] Usb: Populate UsbDataStatus only when not populated Do not override UsbDataStatus when already populated. Compliance warnings such as missing Rp do not populate UsbDataStatus and the port partner is detected. Populate UsbDataStatus only when not populated. Bug: 279251052 Change-Id: Ibe71bdd5c521ba90c124d89bd56af90087c0df18 (cherry picked from commit 47e1400c8fef8af1aea985795d7adfe3ff16871b) --- usb/usb/Usb.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 74f6868c..6993275a 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -312,7 +312,8 @@ Status queryNonCompliantChargerStatus(std::vector *currentPortStatus continue; } } - if ((*currentPortStatus)[i].complianceWarnings.size() > 0) { + if ((*currentPortStatus)[i].complianceWarnings.size() > 0 && + (*currentPortStatus)[i].currentPowerRole == PortPowerRole::NONE) { (*currentPortStatus)[i].currentMode = PortMode::UFP; (*currentPortStatus)[i].currentPowerRole = PortPowerRole::SINK; (*currentPortStatus)[i].currentDataRole = PortDataRole::NONE;