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

Commit abb7b411 authored by Robin Lee's avatar Robin Lee
Browse files

Check for expired mergeTarget in mergeAnimation 

Bug: 289178758
Change-Id: I4852fa39591da273a32aa35df95deedd35987c7e
parent dee442c6

libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java

+4 −1
Original line number Diff line number Diff line
@@ -186,9 +186,12 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler { 
            @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        final RemoteTransition remoteTransition = mRequestedRemotes.get(mergeTarget);

        final IRemoteTransition remote = remoteTransition.getRemoteTransition();

        if (remoteTransition == null) return;



        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "   Merge into remote: %s",

                remoteTransition);



        final IRemoteTransition remote = remoteTransition.getRemoteTransition();

        if (remote == null) return;



        IRemoteTransitionFinishedCallback cb = new IRemoteTransitionFinishedCallback.Stub() {