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

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

Merge "Move heavy-weight process state down to cached range."

parents 96626472 f097d42f

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3953,7 +3953,7 @@ package android.app { 
    field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RunningAppProcessInfo> CREATOR;

    field public static final deprecated int IMPORTANCE_BACKGROUND = 400; // 0x190

    field public static final int IMPORTANCE_CACHED = 400; // 0x190

    field public static final int IMPORTANCE_CANT_SAVE_STATE = 270; // 0x10e

    field public static final int IMPORTANCE_CANT_SAVE_STATE = 350; // 0x15e

    field public static final deprecated int IMPORTANCE_EMPTY = 500; // 0x1f4

    field public static final int IMPORTANCE_FOREGROUND = 100; // 0x64

    field public static final int IMPORTANCE_FOREGROUND_SERVICE = 125; // 0x7d

core/java/android/app/ActivityManager.java

+31 −18
Original line number Diff line number Diff line
@@ -457,6 +457,19 @@ public class ActivityManager { 
    /** @hide User operation call: one of related users cannot be stopped. */

    public static final int USER_OP_ERROR_RELATED_USERS_CANNOT_STOP = -4;



    /**

     * Process states, describing the kind of state a particular process is in.

     * When updating these, make sure to also check all related references to the

     * constant in code, and update these arrays:

     *

     * com.android.internal.app.procstats.ProcessState#PROCESS_STATE_TO_STATE

     * com.android.server.am.ProcessList#sProcStateToProcMem

     * com.android.server.am.ProcessList#sFirstAwakePssTimes

     * com.android.server.am.ProcessList#sSameAwakePssTimes

     * com.android.server.am.ProcessList#sTestFirstPssTimes

     * com.android.server.am.ProcessList#sTestSamePssTimes

     */



    /** @hide Not a real process state. */

    public static final int PROCESS_STATE_UNKNOWN = -1;
@@ -491,20 +504,20 @@ public class ActivityManager { 
    /** @hide Process is in the background running a backup/restore operation. */

    public static final int PROCESS_STATE_BACKUP = 9;



    /** @hide Process is in the background, but it can't restore its state so we want

     * to try to avoid killing it. */

    public static final int PROCESS_STATE_HEAVY_WEIGHT = 10;



    /** @hide Process is in the background running a service.  Unlike oom_adj, this level

     * is used for both the normal running in background state and the executing

     * operations state. */

    public static final int PROCESS_STATE_SERVICE = 11;

    public static final int PROCESS_STATE_SERVICE = 10;



    /** @hide Process is in the background running a receiver.   Note that from the

     * perspective of oom_adj, receivers run at a higher foreground level, but for our

     * prioritization here that is not necessary and putting them below services means

     * many fewer changes in some process states as they receive broadcasts. */

    public static final int PROCESS_STATE_RECEIVER = 12;

    public static final int PROCESS_STATE_RECEIVER = 11;



    /** @hide Process is in the background, but it can't restore its state so we want

     * to try to avoid killing it. */

    public static final int PROCESS_STATE_HEAVY_WEIGHT = 12;



    /** @hide Process is in the background but hosts the home activity. */

    public static final int PROCESS_STATE_HOME = 13;
@@ -2941,14 +2954,6 @@ public class ActivityManager { 
         */

        public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170;



        /**

         * Constant for {@link #importance}: This process is running an

         * application that can not save its state, and thus can't be killed

         * while in the background.  This will be used with apps that have

         * {@link android.R.attr#cantSaveState} set on their application tag.

         */

        public static final int IMPORTANCE_CANT_SAVE_STATE = 270;



        /**

         * Constant for {@link #importance}: This process is contains services

         * that should remain running.  These are background services apps have
@@ -2958,6 +2963,14 @@ public class ActivityManager { 
         */

        public static final int IMPORTANCE_SERVICE = 300;



        /**

         * Constant for {@link #importance}: This process is running an

         * application that can not save its state, and thus can't be killed

         * while in the background.  This will be used with apps that have

         * {@link android.R.attr#cantSaveState} set on their application tag.

         */

        public static final int IMPORTANCE_CANT_SAVE_STATE = 350;



        /**

         * Constant for {@link #importance}: This process process contains

         * cached code that is expendable, not actively running any app components
@@ -2993,10 +3006,10 @@ public class ActivityManager { 
                return IMPORTANCE_GONE;

            } else if (procState >= PROCESS_STATE_HOME) {

                return IMPORTANCE_CACHED;

            } else if (procState >= PROCESS_STATE_SERVICE) {

                return IMPORTANCE_SERVICE;

            } else if (procState == PROCESS_STATE_HEAVY_WEIGHT) {

                return IMPORTANCE_CANT_SAVE_STATE;

            } else if (procState >= PROCESS_STATE_SERVICE) {

                return IMPORTANCE_SERVICE;

            } else if (procState >= PROCESS_STATE_TRANSIENT_BACKGROUND) {

                return IMPORTANCE_PERCEPTIBLE;

            } else if (procState >= PROCESS_STATE_IMPORTANT_FOREGROUND) {
@@ -3049,10 +3062,10 @@ public class ActivityManager { 
                return PROCESS_STATE_NONEXISTENT;

            } else if (importance >= IMPORTANCE_CACHED) {

                return PROCESS_STATE_HOME;

            } else if (importance >= IMPORTANCE_SERVICE) {

                return PROCESS_STATE_SERVICE;

            } else if (importance == IMPORTANCE_CANT_SAVE_STATE) {

                return PROCESS_STATE_HEAVY_WEIGHT;

            } else if (importance >= IMPORTANCE_SERVICE) {

                return PROCESS_STATE_SERVICE;

            } else if (importance >= IMPORTANCE_PERCEPTIBLE) {

                return PROCESS_STATE_TRANSIENT_BACKGROUND;

            } else if (importance >= IMPORTANCE_VISIBLE) {

core/java/com/android/internal/app/procstats/ProcessState.java

+1 −1
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ public final class ProcessState { 
        STATE_IMPORTANT_BACKGROUND,     // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND

        STATE_IMPORTANT_BACKGROUND,     // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND

        STATE_BACKUP,                   // ActivityManager.PROCESS_STATE_BACKUP

        STATE_HEAVY_WEIGHT,             // ActivityManager.PROCESS_STATE_HEAVY_WEIGHT

        STATE_SERVICE,                  // ActivityManager.PROCESS_STATE_SERVICE

        STATE_RECEIVER,                 // ActivityManager.PROCESS_STATE_RECEIVER

        STATE_HEAVY_WEIGHT,             // ActivityManager.PROCESS_STATE_HEAVY_WEIGHT

        STATE_HOME,                     // ActivityManager.PROCESS_STATE_HOME

        STATE_LAST_ACTIVITY,            // ActivityManager.PROCESS_STATE_LAST_ACTIVITY

        STATE_CACHED_ACTIVITY,          // ActivityManager.PROCESS_STATE_CACHED_ACTIVITY

core/java/com/android/internal/app/procstats/ProcessStats.java

+9 −9
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ public final class ProcessStats implements Parcelable { 
    public static final int STATE_IMPORTANT_FOREGROUND = 2;

    public static final int STATE_IMPORTANT_BACKGROUND = 3;

    public static final int STATE_BACKUP = 4;

    public static final int STATE_HEAVY_WEIGHT = 5;

    public static final int STATE_SERVICE = 6;

    public static final int STATE_SERVICE_RESTARTING = 7;

    public static final int STATE_RECEIVER = 8;

    public static final int STATE_SERVICE = 5;

    public static final int STATE_SERVICE_RESTARTING = 6;

    public static final int STATE_RECEIVER = 7;

    public static final int STATE_HEAVY_WEIGHT = 8;

    public static final int STATE_HOME = 9;

    public static final int STATE_LAST_ACTIVITY = 10;

    public static final int STATE_CACHED_ACTIVITY = 11;
@@ -141,8 +141,8 @@ public final class ProcessStats implements Parcelable { 


    public static final int[] NON_CACHED_PROC_STATES = new int[] {

            STATE_PERSISTENT, STATE_TOP, STATE_IMPORTANT_FOREGROUND,

            STATE_IMPORTANT_BACKGROUND, STATE_BACKUP, STATE_HEAVY_WEIGHT,

            STATE_SERVICE, STATE_SERVICE_RESTARTING, STATE_RECEIVER

            STATE_IMPORTANT_BACKGROUND, STATE_BACKUP,

            STATE_SERVICE, STATE_SERVICE_RESTARTING, STATE_RECEIVER, STATE_HEAVY_WEIGHT

    };



    public static final int[] BACKGROUND_PROC_STATES = new int[] {
@@ -152,13 +152,13 @@ public final class ProcessStats implements Parcelable { 


    public static final int[] ALL_PROC_STATES = new int[] { STATE_PERSISTENT,

            STATE_TOP, STATE_IMPORTANT_FOREGROUND, STATE_IMPORTANT_BACKGROUND, STATE_BACKUP,

            STATE_HEAVY_WEIGHT, STATE_SERVICE, STATE_SERVICE_RESTARTING, STATE_RECEIVER,

            STATE_HOME, STATE_LAST_ACTIVITY, STATE_CACHED_ACTIVITY,

            STATE_SERVICE, STATE_SERVICE_RESTARTING, STATE_RECEIVER,

            STATE_HEAVY_WEIGHT, STATE_HOME, STATE_LAST_ACTIVITY, STATE_CACHED_ACTIVITY,

            STATE_CACHED_ACTIVITY_CLIENT, STATE_CACHED_EMPTY

    };



    // Current version of the parcel format.

    private static final int PARCEL_VERSION = 22;

    private static final int PARCEL_VERSION = 23;

    // In-memory Parcel magic number, used to detect attempts to unmarshall bad data

    private static final int MAGIC = 0x50535454;

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

+1 −1
Original line number Diff line number Diff line
@@ -2640,7 +2640,7 @@ public final class ActiveServices { 
                try {

                    bumpServiceExecutingLocked(s, false, "unbind");

                    if (b.client != s.app && (c.flags&Context.BIND_WAIVE_PRIORITY) == 0

                            && s.app.setProcState <= ActivityManager.PROCESS_STATE_RECEIVER) {

                            && s.app.setProcState <= ActivityManager.PROCESS_STATE_HEAVY_WEIGHT) {

                        // If this service's process is not already in the cached list,

                        // then update it in the LRU list here because this may be causing

                        // it to go down there and we want it to start out near the top.