Merge "Clear FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT properly" into udc-dev am: 53c901a01c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23109636

Change-Id: I0712c32fd1a28cbc326af6f995183130c238a595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-10 11:50:29 +00:00
committed by Automerger Merge Worker

View File

@@ -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");