commit 266c0b2a279c435b5ae22bd15435ec80b08e2f52
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jul 07 01:36:56 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 07 01:36:56 2023 +0000
tree 704331849e5cc6e19ee4b086d05447f9038a56fe
parent 160dcce972085d0efe497743630c5955af8a0e40
parent 284c7a3d1469ae75144ee1374331992a7a34dd97

Merge "Apply the correct activityOption" into udc-qpr-dev am: 73e2b5d53e am: 284c7a3d14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23856486

Change-Id: I6bb1ebf3c8989feaadc56f6fa380282eaa390a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

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 3669bce..af8ef17 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
@@ -624,8 +624,8 @@
                         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);
     }
 
     /**