From 5448fcf5bb4f1ee91102d3645a14ff79f7c41d5f Mon Sep 17 00:00:00 2001 From: Tiger Date: Tue, 9 May 2023 19:46:11 +0800 Subject: [PATCH] Clear FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT properly This CL removes FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT when removing starting window. Otherwise, it will make us to abort any transitions that the activity is involved. Fix: 279800916 Test: 1. Open WhatsApp. 2. Open a conversation. 3. See if there is an animation while opening the conversation. Change-Id: I138af8492d1c57f9053cbb27c3c1748989353fd7 --- services/core/java/com/android/server/wm/ActivityRecord.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 26b40b4c09ee4..7d0b4c4e4fdbe 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2882,6 +2882,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mStartingData = null; mStartingSurface = null; mStartingWindow = null; + mTransitionChangeFlags &= ~FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT; if (surface == null) { ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "startingWindow was set but " + "startingSurface==null, couldn't remove");