From be00d1693451c7122b55fb8e30678810acb8de39 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 9 Jun 2021 14:21:24 -0700 Subject: [PATCH] Check for null shortcut before adding new split select options Bug: 190494300 Test: Manual Change-Id: I8fe2b2fa0b1d9d4300b0bc306aa2e0667e5faa1c --- .../src/com/android/quickstep/TaskOverlayFactory.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index c1c85de413..729710715a 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -68,13 +68,14 @@ public class TaskOverlayFactory implements ResourceBasedOverride { final BaseDraggingActivity activity = BaseActivity.fromContext(taskView.getContext()); for (TaskShortcutFactory menuOption : MENU_OPTIONS) { SystemShortcut shortcut = menuOption.getShortcut(activity, taskView); - if (menuOption == TaskShortcutFactory.SPLIT_SCREEN && - FeatureFlags.ENABLE_SPLIT_SELECT.get()) { - addSplitOptions(shortcuts, activity, taskView, deviceProfile); + if (shortcut == null) { continue; } - if (shortcut != null) { + if (menuOption == TaskShortcutFactory.SPLIT_SCREEN && + FeatureFlags.ENABLE_SPLIT_SELECT.get()) { + addSplitOptions(shortcuts, activity, taskView, deviceProfile); + } else { shortcuts.add(shortcut); } }