From df7c1e93cc119e8587d02b94f1c2c9f14d91a35c Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Tue, 29 Oct 2024 07:25:08 +0000 Subject: Ensure the top-resumed-activity is updated after WCT applied The Recents activity was resumed while applying WCT, and the top-resumed-activity change was not reported after commit 171d4ad. Bug: 376184135 Test: Swipe up to Recents Flag: EXEMPT bugfix Change-Id: I5ed3885b47b7f1f9fe003011ea265942251279a9 --- .../core/java/com/android/server/wm/WindowOrganizerController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index 166d74b132bd..dac8f69a4cae 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -813,6 +813,10 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub mService.mTaskSupervisor.setDeferRootVisibilityUpdate(false /* deferUpdate */); if (deferResume) { mService.mTaskSupervisor.endDeferResume(); + // Transient launching the Recents via HIERARCHY_OP_TYPE_PENDING_INTENT directly + // resume the Recents activity with no TRANSACT_EFFECTS_LIFECYCLE. Explicitly + // checks if the top resumed activity should be updated after defer-resume ended. + mService.mTaskSupervisor.updateTopResumedActivityIfNeeded("endWCT"); } mService.continueWindowLayout(); } -- cgit v1.2.3-59-g8ed1b