commit 0f8d28024e39b81faec2c00dbd40991f720ef52f
author Sergey Pinkevich <spinkevich@google.com> Fri Jan 05 11:34:55 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 05 11:34:55 2024 +0000
tree 14ed5740d714a90e4ca086b4e6f84ec7c8b017ca
parent b88ba19233ac3f6d1681a81716cc61ef9286218d
parent c7dcb95b4cec93cc4cd83c28bfdccd26db4beed7

Merge "Java crash on RecentsView.isTaskViewVisible method" into main

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
index a9fa337..193cc2b 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -667,8 +667,10 @@
 
             MAIN_EXECUTOR.execute(() -> {
                 // Only animate from taskView if it's already visible
-                boolean shouldLaunchFromTaskView = mLaunchingTaskView != null &&
-                        mLaunchingTaskView.getRecentsView().isTaskViewVisible(mLaunchingTaskView);
+                boolean shouldLaunchFromTaskView = mLaunchingTaskView != null
+                        && mLaunchingTaskView.getRecentsView() != null
+                        && mLaunchingTaskView.getRecentsView().isTaskViewVisible(
+                        mLaunchingTaskView);
                 mSplitAnimationController.playSplitLaunchAnimation(
                         shouldLaunchFromTaskView ? mLaunchingTaskView : null,
                         mLaunchingIconView,