commit 284fdfb2e318903d2bec41d9a050d27ca303ac97
author Massimo Carli <mcarli@google.com> Tue Mar 11 03:55:06 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 11 03:55:06 2025 -0700
tree 95641b58c5a1e8c8592ff49e1cb090e74acf2fcd
parent b6bae63a6efacf460349b33dcac1f40ab79f3b03
parent 156b9b318443805f6b12726eace0a88850ca041c

Merge "Consider userId in transparent policy heuristic" into main

quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt

diff --git a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt
index 914855b..4280baf 100644
--- a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt
+++ b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt
@@ -82,6 +82,7 @@
                             taskKey.numActivities,
                             taskKey.isTopActivityNoDisplay,
                             taskKey.isActivityStackTransparent,
+                            taskKey.userId,
                         ) -> null
 
                         !taskContainer.task.isDockable -> null

quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt

diff --git a/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt
index f97cf9c..3b823f5 100644
--- a/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt
+++ b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt
@@ -80,6 +80,7 @@
                             taskKey.numActivities,
                             taskKey.isTopActivityNoDisplay,
                             taskKey.isActivityStackTransparent,
+                            taskKey.userId,
                         ) -> null
 
                         else -> {