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

Commit 743847b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT properly" into udc-dev... 

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

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



Change-Id: I2872cf4e13dae1bed5766a6e75bad4937bef3bf8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9561823 324a664b

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