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

Commit 10fc4fdd authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Swap "foreground service" and "bound foreground service" proc states. 

It has become apparent that apps running foreground services is
a much more important (and less common) state than all the various
ways apps run in the foreground because of the system being bound
to them or whatever else.  So push this up about the bound foreground
service state, right after the explicit TOP state.  Then we can
keep these together as "the app is explicitly running in the
foreground for some reason", etc.

Bug: 70808931
Test: CtsAppTestCases
Change-Id: Icfc1905b8e3eb60ddf26118c61ec1ef095659436
parent 245a749d

core/java/android/app/ActivityManager.java

+6 −6
Original line number Diff line number Diff line
@@ -485,11 +485,11 @@ public class ActivityManager { 
     * all activities that are visible to the user. */

    public static final int PROCESS_STATE_TOP = 2;



    /** @hide Process is hosting a foreground service due to a system binding. */

    public static final int PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 3;



    /** @hide Process is hosting a foreground service. */

    public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4;

    public static final int PROCESS_STATE_FOREGROUND_SERVICE = 3;



    /** @hide Process is hosting a foreground service due to a system binding. */

    public static final int PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 4;



    /** @hide Process is important to the user, and something they are aware of. */

    public static final int PROCESS_STATE_IMPORTANT_FOREGROUND = 5;
@@ -3086,11 +3086,11 @@ public class ActivityManager { 
            } else if (importance >= IMPORTANCE_VISIBLE) {

                return PROCESS_STATE_IMPORTANT_FOREGROUND;

            } else if (importance >= IMPORTANCE_TOP_SLEEPING_PRE_28) {

                return PROCESS_STATE_FOREGROUND_SERVICE;

                return PROCESS_STATE_IMPORTANT_FOREGROUND;

            } else if (importance >= IMPORTANCE_FOREGROUND_SERVICE) {

                return PROCESS_STATE_FOREGROUND_SERVICE;

            } else {

                return PROCESS_STATE_BOUND_FOREGROUND_SERVICE;

                return PROCESS_STATE_TOP;

            }

        }

core/java/android/os/BatteryStats.java

+2 −2
Original line number Diff line number Diff line
@@ -525,8 +525,8 @@ public abstract class BatteryStats implements Parcelable { 
            return ActivityManager.PROCESS_STATE_NONEXISTENT;

        } else if (procState == ActivityManager.PROCESS_STATE_TOP) {

            return Uid.PROCESS_STATE_TOP;

        } else if (procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) {

            // Persistent and other foreground states go here.

        } else if (procState == ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) {

            // State when app has put itself in the foreground.

            return Uid.PROCESS_STATE_FOREGROUND_SERVICE;

        } else if (procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) {

            // Persistent and other foreground states go here.

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

+1 −1
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ public final class ProcessState { 
        STATE_PERSISTENT,               // ActivityManager.PROCESS_STATE_PERSISTENT

        STATE_PERSISTENT,               // ActivityManager.PROCESS_STATE_PERSISTENT_UI

        STATE_TOP,                      // ActivityManager.PROCESS_STATE_TOP

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND

        STATE_IMPORTANT_BACKGROUND,     // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND

        STATE_IMPORTANT_BACKGROUND,     // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND

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

+4 −3
Original line number Diff line number Diff line
@@ -14175,7 +14175,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) {

                ProcessRecord proc = mLruProcesses.get(i);

                if (proc.notCachedSinceIdle) {

                    if (proc.setProcState >= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE

                    if (proc.setProcState >= ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE

                            && proc.setProcState <= ActivityManager.PROCESS_STATE_SERVICE) {

                        if (doKilling && proc.initialIdlePss != 0

                                && proc.lastPss > ((proc.initialIdlePss*3)/2)) {
@@ -21420,7 +21420,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                mAppWarnings.onDensityChanged();















                killAllBackgroundProcessesExcept(N,













                        ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE);













                        ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE);















            }















        }
























@@ -22394,6 +22394,7 @@ public class ActivityManagerService extends IActivityManager.Stub













            // to the top state.















            switch (procState) {















                case ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE:













                case ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE:















                    // Something else is keeping it at this level, just leave it.















                    break;















                case ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND:










@@ -23231,7 +23232,7 @@ public class ActivityManagerService extends IActivityManager.Stub













        // To avoid some abuse patterns, we are going to be careful about what we consider















        // to be an app interaction.  Being the top activity doesn't count while the display















        // is sleeping, nor do short foreground services.













        if (app.curProcState <= ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE) {













        if (app.curProcState <= ActivityManager.PROCESS_STATE_TOP) {















            isInteraction = true;















            app.fgInteractionTime = 0;















        } else if (app.curProcState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) {

























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



+11
−10




























Original line number
Diff line number
Diff line








@@ -358,12 +358,12 @@ public final class ProcessList {













            case ActivityManager.PROCESS_STATE_TOP:















                procState = "TOP ";















                break;













            case ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE:













                procState = "BFGS";













                break;















            case ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE:















                procState = "FGS ";















                break;













            case ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE:













                procState = "BFGS";













                break;















            case ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND:















                procState = "IMPF";















                break;










@@ -498,8 +498,8 @@ public final class ProcessList {













        PROC_MEM_PERSISTENT,            // ActivityManager.PROCESS_STATE_PERSISTENT















        PROC_MEM_PERSISTENT,            // ActivityManager.PROCESS_STATE_PERSISTENT_UI















        PROC_MEM_TOP,                   // ActivityManager.PROCESS_STATE_TOP













        PROC_MEM_IMPORTANT,             // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PROC_MEM_IMPORTANT,             // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE













        PROC_MEM_IMPORTANT,             // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PROC_MEM_IMPORTANT,             // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND















        PROC_MEM_IMPORTANT,             // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND















        PROC_MEM_IMPORTANT,             // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND









@@ -520,8 +520,8 @@ public final class ProcessList {













        PSS_FIRST_PERSISTENT_INTERVAL,  // ActivityManager.PROCESS_STATE_PERSISTENT















        PSS_FIRST_PERSISTENT_INTERVAL,  // ActivityManager.PROCESS_STATE_PERSISTENT_UI















        PSS_FIRST_TOP_INTERVAL,         // ActivityManager.PROCESS_STATE_TOP













        PSS_FIRST_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_FIRST_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE













        PSS_FIRST_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_FIRST_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND















        PSS_FIRST_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND















        PSS_FIRST_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND









@@ -542,8 +542,8 @@ public final class ProcessList {













        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_PERSISTENT















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_PERSISTENT_UI















        PSS_SAME_TOP_INTERVAL,          // ActivityManager.PROCESS_STATE_TOP













        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE













        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND









@@ -564,8 +564,8 @@ public final class ProcessList {













        PSS_FIRST_ASLEEP_PERSISTENT_INTERVAL,   // ActivityManager.PROCESS_STATE_PERSISTENT















        PSS_FIRST_ASLEEP_PERSISTENT_INTERVAL,   // ActivityManager.PROCESS_STATE_PERSISTENT_UI















        PSS_FIRST_ASLEEP_TOP_INTERVAL,          // ActivityManager.PROCESS_STATE_TOP













        PSS_FIRST_ASLEEP_BACKGROUND_INTERVAL,   // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_FIRST_ASLEEP_BACKGROUND_INTERVAL,   // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE













        PSS_FIRST_ASLEEP_BACKGROUND_INTERVAL,   // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_FIRST_ASLEEP_BACKGROUND_INTERVAL,   // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND















        PSS_FIRST_ASLEEP_BACKGROUND_INTERVAL,   // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND















        PSS_FIRST_ASLEEP_BACKGROUND_INTERVAL,   // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND









@@ -586,8 +586,9 @@ public final class ProcessList {













        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_PERSISTENT















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_PERSISTENT_UI















        PSS_SAME_TOP_INTERVAL,          // ActivityManager.PROCESS_STATE_TOP













        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE













        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE













        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND















        PSS_SAME_IMPORTANT_INTERVAL,    // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND









@@ -608,8 +609,8 @@ public final class ProcessList {













        PSS_TEST_FIRST_TOP_INTERVAL,        // ActivityManager.PROCESS_STATE_PERSISTENT















        PSS_TEST_FIRST_TOP_INTERVAL,        // ActivityManager.PROCESS_STATE_PERSISTENT_UI















        PSS_TEST_FIRST_TOP_INTERVAL,        // ActivityManager.PROCESS_STATE_TOP













        PSS_TEST_FIRST_BACKGROUND_INTERVAL, // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_TEST_FIRST_BACKGROUND_INTERVAL, // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE













        PSS_TEST_FIRST_BACKGROUND_INTERVAL, // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_TEST_FIRST_BACKGROUND_INTERVAL, // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND















        PSS_TEST_FIRST_BACKGROUND_INTERVAL, // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND















        PSS_TEST_FIRST_BACKGROUND_INTERVAL, // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND









@@ -630,8 +631,8 @@ public final class ProcessList {













        PSS_TEST_SAME_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_PERSISTENT















        PSS_TEST_SAME_BACKGROUND_INTERVAL,  // ActivityManager.PROCESS_STATE_PERSISTENT_UI















        PSS_TEST_SAME_IMPORTANT_INTERVAL,   // ActivityManager.PROCESS_STATE_TOP













        PSS_TEST_SAME_IMPORTANT_INTERVAL,   // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_TEST_SAME_IMPORTANT_INTERVAL,   // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE













        PSS_TEST_SAME_IMPORTANT_INTERVAL,   // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE















        PSS_TEST_SAME_IMPORTANT_INTERVAL,   // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND















        PSS_TEST_SAME_IMPORTANT_INTERVAL,   // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND















        PSS_TEST_SAME_IMPORTANT_INTERVAL,   // ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND