From 1077291b14fd480cfc2c6f3a1237beb91cd75151 Mon Sep 17 00:00:00 2001
From: Jeff Chang <chengjeff@google.com>
Date: Fri, 30 Jun 2023 02:02:26 +0000
Subject: [PATCH] Apply the correct activityOption

The multi_task flag is not applied to the activityOption. Update the
correct activityOption to fix.

Bug: 289451117
Test: Start shortcut and task with chrome.
Change-Id: I0749be388a59e5b15a2c3c6bc122cd03099a8d83
---
 .../android/wm/shell/splitscreen/SplitScreenController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
index e294229038f2a..9747e67fb6824 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
@@ -616,8 +616,8 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
                         Toast.LENGTH_SHORT).show();
             }
         }
-        mStageCoordinator.startShortcutAndTask(shortcutInfo, options1, taskId, options2,
-                splitPosition, splitRatio, remoteTransition, instanceId);
+        mStageCoordinator.startShortcutAndTask(shortcutInfo, activityOptions.toBundle(), taskId,
+                options2, splitPosition, splitRatio, remoteTransition, instanceId);
     }
 
     /**