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

Commit 3a681937 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update the order in which we apply new proc_state/oom_adj values." into sc-dev

parents 9e028b32 1e7aefbe

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

+1 −3
Original line number Diff line number Diff line
@@ -522,8 +522,6 @@ public final class OomAdjuster { 


        computeOomAdjLSP(app, cachedAdj, TOP_APP, doingAll, now, false, true);



        boolean success = applyOomAdjLSP(app, doingAll, now, SystemClock.elapsedRealtime());



        if (uidRec != null) {

            // After uidRec.reset() above, for UidRecord with multiple processes (ProcessRecord),

            // we need to apply all ProcessRecord into UidRecord.
@@ -540,7 +538,7 @@ public final class OomAdjuster { 
            }

        }



        return success;

        return applyOomAdjLSP(app, doingAll, now, SystemClock.elapsedRealtime());

    }



    /**