commit 53c901a01cba683e7a7cbe1c76c97f2f87eec22d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 10 11:24:31 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 10 11:24:31 2023 +0000
tree 0967d8ef89edbb1358006f5077db47b955c940de
parent a08ca180432ad9617a02feeafeaf2faa675b4fa5
parent 5448fcf5bb4f1ee91102d3645a14ff79f7c41d5f

Merge "Clear FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT properly" into udc-dev

services/core/java/com/android/server/wm/ActivityRecord.java

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index cb7c7ae..1e50f3d 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 @@
             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");