From 72e47ac89dbeced2268b2c968d0d64f3fcea31d0 Mon Sep 17 00:00:00 2001 From: Liran Binyamin Date: Wed, 5 Mar 2025 12:43:52 -0800 Subject: 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 --- .../Shell/src/com/android/wm/shell/dagger/WMShellModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs') 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)); } -- cgit v1.2.3-59-g8ed1b