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

Commit b610010f authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Do not load DecorView info if a task is closing 

When an app is removed with split screen activated, trying to find the
task and keeping the split screen is not feasible. In that case, we
should not relayout the corresponding DecorView as it has no effect and
will crash. With this change, removing an app in split screen will no
longer cause crashes.

Bug: 394502142
Test: Remove app while the app is in split screen, observes no crash
Flag: com.android.window.flags.skip_decor_view_relayout_when_closing_bugfix
Change-Id: Iceeec260317b8af97fa3538e53e0f896241855e7
parent 4d2a2953

core/java/android/window/DesktopModeFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ public enum DesktopModeFlags { 
            Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true),

    INHERIT_TASK_BOUNDS_FOR_TRAMPOLINE_TASK_LAUNCHES(

            Flags::inheritTaskBoundsForTrampolineTaskLaunches, false),

    SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX(

            Flags::skipDecorViewRelayoutWhenClosingBugfix, false),

    // go/keep-sorted end

    ;

core/java/android/window/flags/lse_desktop_experience.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -925,6 +925,16 @@ flag { 
    }

}



flag {

    name: "skip_decor_view_relayout_when_closing_bugfix"

    namespace: "lse_desktop_experience"

    description: "Enables bugfix to skip DecorView relayout when the corresponding window is closing."

    bug: "394502142"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_size_compat_mode_improvements_for_connected_displays"

    namespace: "lse_desktop_experience"

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+2 −2
Original line number Diff line number Diff line
@@ -156,12 +156,12 @@ import kotlin.Pair; 
import kotlin.Unit;

import kotlin.jvm.functions.Function1;



import org.jetbrains.annotations.NotNull;



import kotlinx.coroutines.CoroutineScope;

import kotlinx.coroutines.ExperimentalCoroutinesApi;

import kotlinx.coroutines.MainCoroutineDispatcher;



import org.jetbrains.annotations.NotNull;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashSet;

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+3 −1
Original line number Diff line number Diff line
@@ -540,7 +540,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            return;

        }



        if (oldRootView != mResult.mRootView) {

        if (DesktopModeFlags.SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX.isTrue()

                ? (oldRootView != mResult.mRootView && taskInfo.isVisibleRequested)

                : oldRootView != mResult.mRootView) {

            disposeStatusBarInputLayer();

            mWindowDecorViewHolder = createViewHolder();

            // Load these only when first creating the view.