Check for expired mergeTarget in mergeAnimation

Bug: 289178758
Change-Id: I4852fa39591da273a32aa35df95deedd35987c7e
This commit is contained in:
Robin Lee
2023-07-17 08:57:45 +00:00
parent dee442c635
commit abb7b41192

View File

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