From 719154dc1bfc2b717042001945f9e147e8a72722 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 18 May 2021 23:03:59 -0700
Subject: [PATCH] Don't set enabled on TaskMenu view if shortcut not available

Bug: 188195640
Test: No crash when opening tasks when SPLIT_SELECT flag on.
Change-Id: I8f27e311cbb03ea37dcbd63d209b6652f02074af
---
 quickstep/src/com/android/quickstep/TaskShortcutFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index c06e9a90fa..4ec1c15f4d 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -231,7 +231,7 @@ public interface TaskShortcutFactory {
         @Override
         public SystemShortcut getShortcut(BaseDraggingActivity activity, TaskView taskView) {
             SystemShortcut shortcut = super.getShortcut(activity, taskView);
-            if (FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
+            if (shortcut != null && FeatureFlags.ENABLE_SPLIT_SELECT.get()) {
                 // Disable if there's only one recent app for split screen
                 shortcut.setEnabled(taskView.getRecentsView().getTaskViewCount() > 1);
             }