summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Liran Binyamin <liranb@google.com> 2025-03-05 12:43:52 -0800
committer Liran Binyamin <liranb@google.com> 2025-03-05 12:43:52 -0800
commit72e47ac89dbeced2268b2c968d0d64f3fcea31d0 (patch)
treeba0db72219c88e6d5fa6b378b57db0d4eaaf77a5
parent1aa93c30d1b3d01c1608628194aef582022eb6c1 (diff)
Fix sysui crash with bubble to fullscreen flag
When bubble to fullscreen flag is enabled we create a DesktopTasksController, which depends on a DesksTransitionObserver. However, the Provides method for DesksTransitionObserver doesn't check for the state of the bubble to fullscreen flag so it may be empty, which results in a crash on startup. This change updates the Provides method for DesksTransitionObserver to interrogate the state of the flag. Flag: com.android.wm.shell.enable_bubble_to_fullscreen Fixes: 401021955 Test: manual - enable bubble to fullscreen flag - verify sysui doesn't crash on startup Change-Id: Ia6b8b0c1643e443cb6a414621c1e478aa88b1040
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java
index d230425680ce..6a04b06fc4ef 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java
@@ -1235,7 +1235,7 @@ public abstract class WMShellModule {
@DynamicOverride DesktopUserRepositories desktopUserRepositories,
@NonNull DesksOrganizer desksOrganizer
) {
- if (DesktopModeStatus.canEnterDesktopMode(context)) {
+ if (DesktopModeStatus.canEnterDesktopModeOrShowAppHandle(context)) {
return Optional.of(
new DesksTransitionObserver(desktopUserRepositories, desksOrganizer));
}