From 4b0a5bf3e2e9d8c343dfe706d286e8a9fac5e7eb Mon Sep 17 00:00:00 2001
From: Gustav Sennton <gsennton@google.com>
Date: Tue, 21 Jan 2025 12:59:40 +0000
Subject: [PATCH] Pass empty bundle instead of null to
 startLaunchIntentTransition()

Bug: 391309665
Test: manual; launch app from AllApps tray when in Desktop Mode
Flag: com.android.window.flags.enable_desktop_windowing_mode
Change-Id: Ic31ed43f6f2de630b2d235028ebd9643a8a8cf49
---
 .../com/android/launcher3/taskbar/TaskbarActivityContext.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index a0f3948686..e28e488e34 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -1682,7 +1682,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
             }
             if (areDesktopTasksVisible()) {
                 ActivityOptionsWrapper opts = getActivityLaunchDesktopOptions(info);
-                Bundle optionsBundle = opts == null ? null : opts.options.toBundle();
+                Bundle optionsBundle = opts == null ? Bundle.EMPTY : opts.options.toBundle();
                 mSysUiProxy.startLaunchIntentTransition(intent, optionsBundle, displayId);
             } else {
                 startActivity(intent, null);