commit 826cbf9c81068864764bde7093fb91fc11d4762a
author Gustav Sennton <gsennton@google.com> Wed Jan 22 01:03:11 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 22 01:03:11 2025 -0800
tree 9adccf9cd50330adc188958296445adf362552a0
parent e3220bec925c2fcec2ec66da844fcb350ce5854e
parent 4b0a5bf3e2e9d8c343dfe706d286e8a9fac5e7eb

Merge "Pass empty bundle instead of null to startLaunchIntentTransition()" into main

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index a0f3948..e28e488 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -1682,7 +1682,7 @@
             }
             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);