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

Commit 6875734a authored by Hugo Benichi's avatar Hugo Benichi
Browse files

am: regroup debug conditionals in OomAdjusterImpl 

Bug: 425766486
Test: m services.core
Test: atest MockingOomAdjusterTests OomAdjusterTests
Test: atest FrameworksServicesTestsRavenwood_ProcessStateController
Test: atest FrameworksMockingServicesTests_android_server_am_broadcast
Flag: EXEMPT pure refactor

Change-Id: Id8ff6f30d92272b527c2572165aa092982ebf30e
parent d0bbb392

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

+37 −38
Original line number Diff line number Diff line
@@ -1213,15 +1213,15 @@ public class OomAdjusterImpl extends OomAdjuster { 
        app.mOptRecord.setShouldNotFreeze(uidRec != null && uidRec.isCurAllowListed(),

                ProcessCachedOptimizerRecord.SHOULD_NOT_FREEZE_REASON_UID_ALLOWLISTED, mAdjSeq);



        final int appUid = app.info.uid;

        final int logUid = mService.mCurOomAdjUid;

        final boolean reportDebugMsgs =

                DEBUG_OOM_ADJ_REASON || mService.mCurOomAdjUid == app.info.uid;



        final ProcessServiceRecord psr = app.mServices;



        if (state.getMaxAdj() <= FOREGROUND_APP_ADJ) {

            // The max adjustment doesn't allow this app to be anything

            // below foreground, so it is not worth doing work for it.

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making fixed: " + app);

            }

            state.setAdjType("fixed");
@@ -1292,7 +1292,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            }

            hasVisibleActivities = true;

            procState = PROCESS_STATE_TOP;

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making top: " + app);

            }

        } else if (state.isRunningRemoteAnimation()) {
@@ -1300,7 +1300,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            schedGroup = SCHED_GROUP_TOP_APP;

            state.setAdjType("running-remote-anim");

            procState = PROCESS_STATE_CUR_TOP;

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making running remote anim: " + app);

            }

        } else if (app.hasActiveInstrumentation()) {
@@ -1310,7 +1310,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            state.setAdjType("instrumentation");

            procState = PROCESS_STATE_FOREGROUND_SERVICE;

            capability |= PROCESS_CAPABILITY_BFSL;

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making instrumentation: " + app);

            }

        } else if (isReceivingBroadcast(app)) {
@@ -1327,7 +1327,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            }

            state.setAdjType("broadcast");

            procState = ActivityManager.PROCESS_STATE_RECEIVER;

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making broadcast: " + app);

            }

        } else if (psr.numberOfExecutingServices() > 0) {
@@ -1338,7 +1338,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                    ? SCHED_GROUP_DEFAULT : SCHED_GROUP_BACKGROUND;

            state.setAdjType("exec-service");

            procState = PROCESS_STATE_SERVICE;

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making exec-service: " + app);

            }

        } else if (app == topApp) {
@@ -1346,7 +1346,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            schedGroup = SCHED_GROUP_BACKGROUND;

            state.setAdjType("top-sleeping");

            procState = PROCESS_STATE_CUR_TOP;

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making top (sleeping): " + app);

            }

        } else {
@@ -1356,7 +1356,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            adj = ProcessList.UNKNOWN_ADJ;

            procState = PROCESS_STATE_CACHED_EMPTY;

            state.setAdjType("cch-empty");

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making empty: " + app);

            }

        }
@@ -1364,7 +1364,6 @@ public class OomAdjusterImpl extends OomAdjuster { 
        // Examine all non-top activities.

        boolean foregroundActivities = app == topApp;

        if (!foregroundActivities && state.getHasActivities()) {

            boolean reportDebugMsgs = DEBUG_OOM_ADJ_REASON || logUid == appUid;

            mTmpOomAdjWindowCalculator.computeOomAdjFromActivitiesIfNecessary(app, adj,

                    foregroundActivities, hasVisibleActivities, procState, schedGroup,

                    PROCESS_STATE_CUR_TOP, reportDebugMsgs);
@@ -1380,7 +1379,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
        if (procState > PROCESS_STATE_CACHED_RECENT && state.getHasRecentTasks()) {

            procState = PROCESS_STATE_CACHED_RECENT;

            state.setAdjType("cch-rec");

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise procstate to cached recent: " + app);

            }

        }
@@ -1434,7 +1433,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                state.setAdjType(adjType);

                schedGroup = SCHED_GROUP_DEFAULT;



                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to " + adjType + ": "

                            + app + " ");

                }
@@ -1456,7 +1455,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                adj = PERCEPTIBLE_RECENT_FOREGROUND_APP_ADJ + 1;

                state.setAdjType("fg-service-short-act");

            }

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to recent fg: " + app);

            }

            maybeSetProcessFollowUpUpdateLocked(app,
@@ -1478,7 +1477,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            // This shall henceforth be called the "EJ" exemption, despite utilizing the

            // ALMOST_PERCEPTIBLE flag to work.

            state.setAdjType("top-ej-act");

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to recent fg for EJ: " + app);

            }

            maybeSetProcessFollowUpUpdateLocked(app,
@@ -1497,7 +1496,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                state.setAdjType("force-imp");

                state.setAdjSource(state.getForcingToImportant());

                schedGroup = SCHED_GROUP_DEFAULT;

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to force imp: " + app);

                }

            }
@@ -1509,14 +1508,14 @@ public class OomAdjusterImpl extends OomAdjuster { 
                adj = HEAVY_WEIGHT_APP_ADJ;

                schedGroup = SCHED_GROUP_BACKGROUND;

                state.setAdjType("heavy");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise adj to heavy: " + app);

                }

            }

            if (procState > ActivityManager.PROCESS_STATE_HEAVY_WEIGHT) {

                procState = ActivityManager.PROCESS_STATE_HEAVY_WEIGHT;

                state.setAdjType("heavy");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise procstate to heavy: " + app);

                }

            }
@@ -1529,14 +1528,14 @@ public class OomAdjusterImpl extends OomAdjuster { 
                adj = HOME_APP_ADJ;

                schedGroup = SCHED_GROUP_BACKGROUND;

                state.setAdjType("home");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise adj to home: " + app);

                }

            }

            if (procState > ActivityManager.PROCESS_STATE_HOME) {

                procState = ActivityManager.PROCESS_STATE_HOME;

                state.setAdjType("home");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise procstate to home: " + app);

                }

            }
@@ -1553,7 +1552,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                procState = PROCESS_STATE_LAST_ACTIVITY;

                schedGroup = SCHED_GROUP_BACKGROUND;

                state.setAdjType("previous-expired");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Expire prev adj: " + app);

                }

            } else {
@@ -1561,14 +1560,14 @@ public class OomAdjusterImpl extends OomAdjuster { 
                    adj = PREVIOUS_APP_ADJ;

                    schedGroup = SCHED_GROUP_BACKGROUND;

                    state.setAdjType("previous");

                    if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                    if (reportDebugMsgs) {

                        reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise adj to prev: " + app);

                    }

                }

                if (procState > PROCESS_STATE_LAST_ACTIVITY) {

                    procState = PROCESS_STATE_LAST_ACTIVITY;

                    state.setAdjType("previous");

                    if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                    if (reportDebugMsgs) {

                        reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise procstate to prev: " + app);

                    }

                }
@@ -1598,14 +1597,14 @@ public class OomAdjusterImpl extends OomAdjuster { 
                    procState = PROCESS_STATE_TRANSIENT_BACKGROUND;

                }

                state.setAdjType("backup");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise adj to backup: " + app);

                }

            }

            if (procState > ActivityManager.PROCESS_STATE_BACKUP) {

                procState = ActivityManager.PROCESS_STATE_BACKUP;

                state.setAdjType("backup");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise procstate to backup: " + app);

                }

            }
@@ -1626,7 +1625,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                if (procState > PROCESS_STATE_SERVICE) {

                    procState = PROCESS_STATE_SERVICE;

                    state.setAdjType("started-services");

                    if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                    if (reportDebugMsgs) {

                        reportOomAdjMessageLocked(TAG_OOM_ADJ,

                                "Raise procstate to started service: " + app);

                    }
@@ -1650,7 +1649,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                        if (!app.isSdkSandbox && adj > SERVICE_ADJ) {

                            adj = SERVICE_ADJ;

                            state.setAdjType("started-services");

                            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                            if (reportDebugMsgs) {

                                reportOomAdjMessageLocked(TAG_OOM_ADJ,

                                        "Raise adj to started service: " + app);

                            }
@@ -1714,7 +1713,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                    schedGroup = SCHED_GROUP_DEFAULT;

                    state.setAdjType("ext-provider");

                    state.setAdjTarget(cpr.name);

                    if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                    if (reportDebugMsgs) {

                        reportOomAdjMessageLocked(TAG_OOM_ADJ,

                                "Raise adj to external provider: " + app);

                    }
@@ -1722,7 +1721,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                if (procState > PROCESS_STATE_IMPORTANT_FOREGROUND) {

                    procState = PROCESS_STATE_IMPORTANT_FOREGROUND;

                    state.setCurRawProcState(procState);

                    if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                    if (reportDebugMsgs) {

                        reportOomAdjMessageLocked(TAG_OOM_ADJ,

                                "Raise procstate to external provider: " + app);

                    }
@@ -1735,7 +1734,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                adj = PREVIOUS_APP_ADJ;

                schedGroup = SCHED_GROUP_BACKGROUND;

                state.setAdjType("recent-provider");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ,

                            "Raise adj to recent provider: " + app);

                }
@@ -1745,7 +1744,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            if (procState > PROCESS_STATE_LAST_ACTIVITY) {

                procState = PROCESS_STATE_LAST_ACTIVITY;

                state.setAdjType("recent-provider");

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ,

                            "Raise procstate to recent provider: " + app);

                }
@@ -1873,8 +1872,8 @@ public class OomAdjusterImpl extends OomAdjuster { 
        final int prevSchedGroup = schedGroup;

        final int prevCapability = capability;



        final int appUid = app.getApplicationUid();

        final int logUid = mService.mCurOomAdjUid;

        final boolean reportDebugMsgs =

                DEBUG_OOM_ADJ_REASON || mService.mCurOomAdjUid == app.getApplicationUid();



        if (!dryRun) {

            app.setCurBoundByNonBgRestrictedApp(app.isCurBoundByNonBgRestrictedApp()
@@ -2182,7 +2181,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                app.setAdjSource(client);

                app.setAdjSourceProcState(clientProcState);

                app.setAdjTarget(cr.binding.service.instanceName);

                if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                if (reportDebugMsgs) {

                    reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to " + adjType

                            + ": " + app + ", due to " + client

                            + " adj=" + adj + " procState="
@@ -2247,7 +2246,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
                    app.setAdjSource(a);

                    app.setAdjSourceProcState(procState);

                    app.setAdjTarget(cr.binding.service.instanceName);

                    if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

                    if (reportDebugMsgs) {

                        reportOomAdjMessageLocked(TAG_OOM_ADJ,

                                "Raise to service w/activity: " + app);

                    }
@@ -2326,8 +2325,8 @@ public class OomAdjusterImpl extends OomAdjuster { 
        final int prevSchedGroup = schedGroup;

        final int prevCapability = capability;



        final int appUid = app.getApplicationUid();

        final int logUid = mService.mCurOomAdjUid;

        final boolean reportDebugMsgs =

                DEBUG_OOM_ADJ_REASON || mService.mCurOomAdjUid == app.getApplicationUid();



        // We always propagate PROCESS_CAPABILITY_BFSL to providers here,

        // but, right before actually setting it to the process,
@@ -2411,7 +2410,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            app.setAdjSource(client);

            app.setAdjSourceProcState(clientProcState);

            app.setAdjTarget(conn.provider.name);

            if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {

            if (reportDebugMsgs) {

                reportOomAdjMessageLocked(TAG_OOM_ADJ, "Raise to " + adjType

                        + ": " + app + ", due to " + client

                        + " adj=" + adj + " procState="