diff options
| author | 2019-10-09 02:38:27 +0000 | |
|---|---|---|
| committer | 2019-10-09 02:38:27 +0000 | |
| commit | b9a532718a6415c50b029c035f434224713ad756 (patch) | |
| tree | e171c1c3ccd497a536b95e6b727ad4220be57359 | |
| parent | d4bd5714f9acbdf969b654553de19ee3732a0ac7 (diff) | |
| parent | 021c064e854a178ddaaddf1d7b3055959a535bb6 (diff) | |
Merge "Rename THREAD_GROUP_BG_NONINTERACTIVE to THREAD_GROUP_BACKGROUND"
| -rw-r--r-- | core/java/android/os/Process.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/OomAdjuster.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessList.java | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 76e728a11e83..43b9c6728868 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -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. * diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 3c2aee40b4fd..bb214bd740a4 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -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: diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index c0af814cdb38..af126f289fc2 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -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; |