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

Commit b9a53271 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename THREAD_GROUP_BG_NONINTERACTIVE to THREAD_GROUP_BACKGROUND"

parents d4bd5714 021c064e

core/java/android/os/Process.java

+2 −3
Original line number Diff line number Diff line
@@ -420,10 +420,9 @@ public class Process { 
     * Background thread group - All threads in

     * this group are scheduled with a reduced share of the CPU.

     * Value is same as constant SP_BACKGROUND of enum SchedPolicy.

     * FIXME rename to THREAD_GROUP_BACKGROUND.

     * @hide

     */

    public static final int THREAD_GROUP_BG_NONINTERACTIVE = 0;

    public static final int THREAD_GROUP_BACKGROUND = 0;



    /**

     * Foreground thread group - All threads in
@@ -809,7 +808,7 @@ public class Process { 
     *

     * group == THREAD_GROUP_DEFAULT means to move all non-background priority

     * threads to the foreground scheduling group, but to leave background

     * priority threads alone.  group == THREAD_GROUP_BG_NONINTERACTIVE moves all

     * priority threads alone.  group == THREAD_GROUP_BACKGROUND moves all

     * threads, regardless of priority, to the background scheduling group.

     * group == THREAD_GROUP_FOREGROUND is not allowed.

     *

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

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import static android.app.ActivityManager.PROCESS_STATE_SERVICE; 
import static android.app.ActivityManager.PROCESS_STATE_TOP;

import static android.app.ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND;

import static android.os.Process.SCHED_OTHER;

import static android.os.Process.THREAD_GROUP_BG_NONINTERACTIVE;

import static android.os.Process.THREAD_GROUP_BACKGROUND;

import static android.os.Process.THREAD_GROUP_DEFAULT;

import static android.os.Process.THREAD_GROUP_RESTRICTED;

import static android.os.Process.THREAD_GROUP_TOP_APP;
@@ -1759,7 +1759,7 @@ public final class OomAdjuster { 
                int processGroup;

                switch (curSchedGroup) {

                    case ProcessList.SCHED_GROUP_BACKGROUND:

                        processGroup = THREAD_GROUP_BG_NONINTERACTIVE;

                        processGroup = THREAD_GROUP_BACKGROUND;

                        break;

                    case ProcessList.SCHED_GROUP_TOP_APP:

                    case ProcessList.SCHED_GROUP_TOP_APP_BOUND:

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

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public final class ProcessList { 
    // Memory pages are 4K.

    static final int PAGE_SIZE = 4 * 1024;



    // Activity manager's version of Process.THREAD_GROUP_BG_NONINTERACTIVE

    // Activity manager's version of Process.THREAD_GROUP_BACKGROUND

    static final int SCHED_GROUP_BACKGROUND = 0;

      // Activity manager's version of Process.THREAD_GROUP_RESTRICTED

    static final int SCHED_GROUP_RESTRICTED = 1;