Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22137095 authored by Pragya Bajoria's avatar Pragya Bajoria Committed by Android (Google) Code Review
Browse files

Merge "Fix SysUI crash with the bubble to fullscreen flag by updating the... 

Merge "Fix SysUI crash with the bubble to fullscreen flag by updating the `provideDesktopPipTransitionObserver` method to check for the status of the flag." into main
parents 83fb9046 71f61d9d

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+1 −1
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ public abstract class WMShellModule { 
    static Optional<DesktopPipTransitionObserver> provideDesktopPipTransitionObserver(

            Context context

    ) {

        if (DesktopModeStatus.canEnterDesktopMode(context)

        if (DesktopModeStatus.canEnterDesktopModeOrShowAppHandle(context)

                && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_PIP.isTrue()) {

            return Optional.of(

                    new DesktopPipTransitionObserver());