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

Commit ba9d00af authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Apply new scheduling group for multi-window mode apps 

Currently it only applies for freeform window mode.
For example, if there are 4 visible freeform apps:
The top 2 will be SCHED_GROUP_TOP_APP.
And the bottom 2 will be SCHED_GROUP_FOREGROUND_MW.

That makes the non-top visible apps have higher priority than
SCHED_GROUP_DEFAULT, so they may be more responsive.

Bug: 200769420
Test: MockingOomAdjusterTests#testUpdateOomAdj_DoOne_VisibleActivities
Flag: com.android.window.flags.process_priority_policy_for_multi_window_mode
Change-Id: I2a78e3e4c7f67d2a1361810413486421e22f74b5
parent 62253d6f

services/core/java/com/android/server/am/OomAdjuster.java

+10 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE; 
import static android.media.audio.Flags.roForegroundAudioControl;

import static android.os.Process.THREAD_GROUP_BACKGROUND;

import static android.os.Process.THREAD_GROUP_DEFAULT;

import static android.os.Process.THREAD_GROUP_FOREGROUND_WINDOW;

import static android.os.Process.THREAD_GROUP_RESTRICTED;

import static android.os.Process.THREAD_GROUP_TOP_APP;

import static android.os.Process.THREAD_PRIORITY_DISPLAY;
@@ -117,6 +118,7 @@ import static com.android.server.am.ProcessList.PERSISTENT_SERVICE_ADJ; 
import static com.android.server.am.ProcessList.PREVIOUS_APP_ADJ;

import static com.android.server.am.ProcessList.SCHED_GROUP_BACKGROUND;

import static com.android.server.am.ProcessList.SCHED_GROUP_DEFAULT;

import static com.android.server.am.ProcessList.SCHED_GROUP_FOREGROUND_WINDOW;

import static com.android.server.am.ProcessList.SCHED_GROUP_RESTRICTED;

import static com.android.server.am.ProcessList.SCHED_GROUP_TOP_APP;

import static com.android.server.am.ProcessList.SCHED_GROUP_TOP_APP_BOUND;
@@ -1713,6 +1715,11 @@ public class OomAdjuster { 
                // The recently used non-top visible freeform app.

                schedGroup = SCHED_GROUP_TOP_APP;

                mAdjType = "perceptible-freeform-activity";

            } else if ((flags

                    & WindowProcessController.ACTIVITY_STATE_FLAG_VISIBLE_MULTI_WINDOW_MODE) != 0) {

                // Currently the only case is from freeform apps which are not close to top.

                schedGroup = SCHED_GROUP_FOREGROUND_WINDOW;

                mAdjType = "vis-multi-window-activity";

            }

            foregroundActivities = true;

            mHasVisibleActivities = true;
@@ -3442,6 +3449,9 @@ public class OomAdjuster { 
                case SCHED_GROUP_RESTRICTED:

                    processGroup = THREAD_GROUP_RESTRICTED;

                    break;

                case SCHED_GROUP_FOREGROUND_WINDOW:

                    processGroup = THREAD_GROUP_FOREGROUND_WINDOW;

                    break;

                default:

                    processGroup = THREAD_GROUP_DEFAULT;

                    break;

services/core/java/com/android/server/am/ProcessList.java

+3 −0
Original line number Diff line number Diff line
@@ -303,6 +303,9 @@ public final class ProcessList { 
    // Activity manager's version of Process.THREAD_GROUP_TOP_APP

    // Disambiguate between actual top app and processes bound to the top app

    static final int SCHED_GROUP_TOP_APP_BOUND = 4;

    // Activity manager's version of Process.THREAD_GROUP_FOREGROUND_WINDOW

    // The priority is like between default and top-app.

    static final int SCHED_GROUP_FOREGROUND_WINDOW = 5;



    // The minimum number of cached apps we want to be able to keep around,

    // without empty apps being able to push them out of memory.

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

+7 −2
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
    public static final int ACTIVITY_STATE_FLAG_HAS_ACTIVITY_IN_VISIBLE_TASK = 1 << 22;

    public static final int ACTIVITY_STATE_FLAG_RESUMED_SPLIT_SCREEN = 1 << 23;

    public static final int ACTIVITY_STATE_FLAG_PERCEPTIBLE_FREEFORM = 1 << 24;

    public static final int ACTIVITY_STATE_FLAG_VISIBLE_MULTI_WINDOW_MODE = 1 << 25;

    public static final int ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER = 0x0000ffff;



    /**
@@ -1305,8 +1306,12 @@ 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 && minTaskLayer <= 1 + MAX_NUM_PERCEPTIBLE_FREEFORM) {

                && minTaskLayer > 1) {

            if (minTaskLayer <= 1 + MAX_NUM_PERCEPTIBLE_FREEFORM) {

                stateFlags |= ACTIVITY_STATE_FLAG_PERCEPTIBLE_FREEFORM;

            } else {

                stateFlags |= ACTIVITY_STATE_FLAG_VISIBLE_MULTI_WINDOW_MODE;

            }

        }

        stateFlags |= minTaskLayer & ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER;

        if (visible) {

services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java

+9 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import static com.android.server.am.ProcessList.PERSISTENT_SERVICE_ADJ; 
import static com.android.server.am.ProcessList.PREVIOUS_APP_ADJ;

import static com.android.server.am.ProcessList.SCHED_GROUP_BACKGROUND;

import static com.android.server.am.ProcessList.SCHED_GROUP_DEFAULT;

import static com.android.server.am.ProcessList.SCHED_GROUP_FOREGROUND_WINDOW;

import static com.android.server.am.ProcessList.SCHED_GROUP_RESTRICTED;

import static com.android.server.am.ProcessList.SCHED_GROUP_TOP_APP;

import static com.android.server.am.ProcessList.SCHED_GROUP_TOP_APP_BOUND;
@@ -507,6 +508,14 @@ public class MockingOomAdjusterTests { 
        updateOomAdj(app);

        assertProcStates(app, PROCESS_STATE_TOP, VISIBLE_APP_ADJ, SCHED_GROUP_TOP_APP);

        assertEquals("perceptible-freeform-activity", app.mState.getAdjType());



        doReturn(WindowProcessController.ACTIVITY_STATE_FLAG_IS_VISIBLE

                | WindowProcessController.ACTIVITY_STATE_FLAG_VISIBLE_MULTI_WINDOW_MODE)

                .when(wpc).getActivityStateFlags();

        updateOomAdj(app);

        assertProcStates(app, PROCESS_STATE_TOP, VISIBLE_APP_ADJ,

                SCHED_GROUP_FOREGROUND_WINDOW);

        assertEquals("vis-multi-window-activity", app.mState.getAdjType());

    }



    @SuppressWarnings("GuardedBy")