diff options
| author | 2023-07-17 08:57:45 +0000 | |
|---|---|---|
| committer | 2023-07-17 08:57:50 +0000 | |
| commit | abb7b411922a1c0de874f9519f5a70abd1c97e06 (patch) | |
| tree | 2ff4210969396d4f18ad86b59024a7973b81fdd3 | |
| parent | dee442c63520cdb094dad06f2af60416d7b5b4a8 (diff) | |
Check for expired mergeTarget in mergeAnimation
Bug: 289178758
Change-Id: I4852fa39591da273a32aa35df95deedd35987c7e
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java index a242c72db8b3..c22cc6fbea8f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java @@ -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() { |