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

Commit 4a14bea0 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Add ENABLE_DW_SCVH_CACHE to dev options" into main

parents dd91c084 866e1ad7

core/java/android/window/DesktopModeFlags.java

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public enum DesktopModeFlags { 
            Flags::enableDesktopWindowingMultiInstanceFeatures, true),

    ENABLE_DESKTOP_WINDOWING_PERSISTENCE(Flags::enableDesktopWindowingPersistence, true),

    ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH(Flags::enableDesktopWindowingQuickSwitch, true),

    ENABLE_DESKTOP_WINDOWING_SCVH_CACHE(Flags::enableDesktopWindowingScvhCacheBugFix, true),

    ENABLE_DESKTOP_WINDOWING_SIZE_CONSTRAINTS(Flags::enableDesktopWindowingSizeConstraints, true),

    ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS(Flags::enableDesktopWindowingTaskbarRunningApps,

            true),

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ public class DesktopModeStatus { 
     * there should be no pooling.

     */

    public static int getWindowDecorScvhPoolSize(@NonNull Context context) {

        if (!Flags.enableDesktopWindowingScvhCacheBugFix()) return 0;

        if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_SCVH_CACHE.isTrue()) return 0;

        final int maxTaskLimit = getMaxTaskLimit(context);

        if (maxTaskLimit > 0) {

            return maxTaskLimit;