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

Commit 1fb6fb15 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove enabled flag process_priority_policy_for_multi_window_mode" into main

parents 502df199 51071066

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

+0 −7
Original line number Diff line number Diff line
@@ -189,13 +189,6 @@ flag { 
  is_fixed_read_only: true

}



flag {

  name: "process_priority_policy_for_multi_window_mode"

  namespace: "windowing_frontend"

  description: "Use higher priority for top-like processes"

  bug: "200769420"

}



flag {

  name: "universal_resizable_by_default"

  namespace: "windowing_frontend"

services/core/java/com/android/server/wm/RootWindowContainer.java

+0 −3
Original line number Diff line number Diff line
@@ -2984,9 +2984,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 


    /** This method is called for visible freeform task from top to bottom. */

    private void computeNonOccludedFreeformAreaRatio(@NonNull Task task) {

        if (!com.android.window.flags.Flags.processPriorityPolicyForMultiWindowMode()) {

            return;

        }

        if (mTmpOccludingRegion == null) {

            mTmpOccludingRegion = new Region();

            mTmpTaskRegion = new Region();

services/core/java/com/android/server/wm/Task.java

+0 −3
Original line number Diff line number Diff line
@@ -1216,9 +1216,6 @@ class Task extends TaskFragment { 


        mAtmService.notifyTaskPersisterLocked(this, false /* flush */);



        if (!com.android.window.flags.Flags.processPriorityPolicyForMultiWindowMode()) {

            return;

        }

        mRootWindowContainer.invalidateTaskLayersAndUpdateOomAdjIfNeeded();

    }

services/core/java/com/android/server/wm/WindowProcessController.java

+0 −3
Original line number Diff line number Diff line
@@ -1289,8 +1289,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
                    stateFlags |= ACTIVITY_STATE_FLAG_HAS_RESUMED;

                    final int windowingMode = r.getWindowingMode();

                    if (windowingMode == WINDOWING_MODE_MULTI_WINDOW

                            && com.android.window.flags.Flags

                                    .processPriorityPolicyForMultiWindowMode()

                            && task.hasAdjacentTask()) {

                        stateFlags |= ACTIVITY_STATE_FLAG_RESUMED_SPLIT_SCREEN;

                    } else if (windowingMode == WINDOWING_MODE_FREEFORM) {
@@ -1344,7 +1342,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
        }



        if (hasResumedFreeform

                && com.android.window.flags.Flags.processPriorityPolicyForMultiWindowMode()

                // Exclude task layer 1 because it is already the top most.

                && minTaskLayer > 1) {

            if (minTaskLayer <= 1 + MAX_NUM_PERCEPTIBLE_FREEFORM

services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java

+0 −2
Original line number Diff line number Diff line
@@ -292,8 +292,6 @@ public class RootWindowContainerTests extends WindowTestsBase { 


    @Test

    public void testTaskLayerRankFreeform() {

        mSetFlagsRule.enableFlags(com.android.window.flags.Flags

                .FLAG_PROCESS_PRIORITY_POLICY_FOR_MULTI_WINDOW_MODE);

        final Task[] freeformTasks = new Task[3];

        final WindowProcessController[] processes = new WindowProcessController[3];

        for (int i = 0; i < freeformTasks.length; i++) {