Merge "Clear FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT properly" into udc-dev

2023-05-10 11:24:31 +00:00
parent a08ca18043 5448fcf5bb
commit 53c901a01c
1 changed files with 1 additions and 0 deletions
--- 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");