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

Commit 64695c36 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Check for expired mergeTarget in mergeAnimation" into udc-qpr-dev am: e0b84069 

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



Change-Id: I0c6faaa84392433d4643552b27f40084f367c57a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23fae3dd e0b84069

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() {