commit 9dbae036d3ca7e45112f17e0c8d44f975250607f
author Jordan Silva <silvajordan@google.com> Mon Oct 21 13:55:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 21 13:55:56 2024 +0000
tree dbf303d2046adba1588867e540030e8477fedd06
parent 4a08fcc3d9e8832c77edc38347cd35b12455de92
parent ca034f122a010cbf0ad572277606b42e8091882d

Merge "Fix crash when initiating split with 5 instances of Chrome in Desktop Windowing" into main

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index eb12ced..b9ff85b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -5045,7 +5045,8 @@
         mSplitHiddenTaskView = getTaskViewByTaskId(splitSelectSource.alreadyRunningTaskId);
         mSplitHiddenTaskViewIndex = indexOfChild(mSplitHiddenTaskView);
         mSplitSelectStateController
-                .setAnimateCurrentTaskDismissal(splitSelectSource.animateCurrentTaskDismissal);
+                .setAnimateCurrentTaskDismissal(splitSelectSource.animateCurrentTaskDismissal
+                        && mSplitHiddenTaskView != null);
 
         // Prevent dismissing whole task if we're only initiating from one of 2 tasks in split pair
         mSplitSelectStateController.setDismissingFromSplitPair(mSplitHiddenTaskView != null