commit 719154dc1bfc2b717042001945f9e147e8a72722
author Vinit Nayak <peanutbutter@google.com> Tue May 18 23:03:59 2021 -0700
committer Vinit Nayak <peanutbutter@google.com> Tue May 18 23:03:59 2021 -0700
tree cdc8d834973b1a072e898f7e343808b575ed872c
parent b605d1d73cd0f10c82b14e9ccbbbce605a077f4f

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

diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index c06e9a9..4ec1c15 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -231,7 +231,7 @@
         @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);
             }