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

Commit 49546f9f authored by Hugo Benichi's avatar Hugo Benichi
Browse files

am: regroup debug conditionals in OomAdjuster 

TODO: check following tests:
com.android.server.am.BackgroundRestrictionTest#testInitialLevels
com.android.server.am.BackgroundRestrictionTest#testTogglingStandbyBucket
com.android.server.am.MockingOomAdjusterTests#testUpdateOomAdj_UidIdle_StopService

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: I672ec55334a52c931a44a616e7430e3d63d95806
parent e0bbeaa6

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

+6 −3
Original line number Diff line number Diff line
@@ -2204,6 +2204,9 @@ public abstract class OomAdjuster { 
        final ProcessRecordInternal state = app;

        final UidRecordInternal uidRec = app.getUidRecord();



        final boolean reportDebugMsgs =

                DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.info.uid;



        if (state.getCurRawAdj() != state.getSetRawAdj()) {

            state.setSetRawAdj(state.getCurRawAdj());

        }
@@ -2222,7 +2225,7 @@ public abstract class OomAdjuster { 
                mInjector.setOomAdj(app.getPid(), app.uid, state.getCurAdj());

            }



            if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.info.uid) {

            if (reportDebugMsgs) {

                String msg = "Set " + app.getPid() + " " + app.processName + " adj "

                        + state.getCurAdj() + ": " + state.getAdjType();

                reportOomAdjMessageLocked(TAG_OOM_ADJ, msg);
@@ -2244,7 +2247,7 @@ public abstract class OomAdjuster { 
        } else if (state.getSetSchedGroup() != curSchedGroup) {

            int oldSchedGroup = state.getSetSchedGroup();

            state.setSetSchedGroup(curSchedGroup);

            if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.uid) {

            if (reportDebugMsgs) {

                String msg = "Setting sched group of " + app.processName

                        + " to " + curSchedGroup + ": " + state.getAdjType();

                reportOomAdjMessageLocked(TAG_OOM_ADJ, msg);
@@ -2356,7 +2359,7 @@ public abstract class OomAdjuster { 
        }

        int oldProcState = state.getSetProcState();

        if (state.getSetProcState() != state.getCurProcState()) {

            if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.uid) {

            if (reportDebugMsgs) {

                String msg = "Proc state change of " + app.processName

                        + " to " + ProcessList.makeProcStateString(state.getCurProcState())

                        + " (" + state.getCurProcState() + ")" + ": " + state.getAdjType();