Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9e20185 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Clear FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT properly" into... 

Merge "Merge "Clear FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT properly" into udc-dev am: 53c901a0 am: 58d5bb00 am: 22b22bdf am: 324a664b"
parents eab33880 743847b5

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

+1 −0
Original line number Diff line number Diff line
@@ -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");