From 1e7aefbef574a823d7acfcd553b51f4d700b0371 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Tue, 23 Feb 2021 07:07:37 -0800 Subject: [PATCH] Update the order in which we apply new proc_state/oom_adj values. We check if the network blocked state (which depends on proc_state) of an uid changed and update a seq counter to keep track of that. We need to do this before the newly computed proc_state/oom_adj values are applied. It used to be like this earlier but seems there was a regression. Fixes: 181013898 Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Test: atest ./services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java Test: atest ./services/tests/servicestests/src/com/android/server/am/OomAdjusterTests.java Test: atest ./tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java Change-Id: Ib5b26c82495856a83cbe6d76594e7503ae37f98c --- services/core/java/com/android/server/am/OomAdjuster.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index d79fb8a265e88..5b09f91ab684a 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -486,8 +486,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. @@ -504,7 +502,7 @@ public final class OomAdjuster { } } - return success; + return applyOomAdjLSP(app, doingAll, now, SystemClock.elapsedRealtime()); } /**