[BugFixed][OOM_ADJ] use max_adj to control process final adj

when app have flag BIND_ABOVE_CLIENT, max adj will be unuseful
system can not limit process adj through max adj, this happen
frequently in various app

Bug: 262672210

Change-Id: I5fa9ea8f573b41899f1e78f8f3fd57aa687b4b12

1 files changed, 2 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index f7fbbe4ebead..f88a1a30fee9 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -2419,7 +2419,7 @@ public class OomAdjuster {
         }
 
         state.setCurRawAdj(adj);
-
+        adj = psr.modifyRawOomAdj(adj);
         if (adj > state.getMaxAdj()) {
             adj = state.getMaxAdj();
             if (adj <= ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {
@@ -2449,7 +2449,7 @@ public class OomAdjuster {
         // it when computing the final cached adj later.  Note that we don't need to
         // worry about this for max adj above, since max adj will always be used to
         // keep it out of the cached vaues.
-        state.setCurAdj(psr.modifyRawOomAdj(adj));
+        state.setCurAdj(adj);
         state.setCurCapability(capability);
         state.setCurrentSchedulingGroup(schedGroup);
         state.setCurProcState(procState);