Merge "[BugFixed][OOM_ADJ] use max_adj to control process final adj" am: 2d361f6350

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2318269

Change-Id: I0dc34f6830cf6196bea420bbc3e0e6d3eedf75fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -2457,7 +2457,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) {
@@ -2487,7 +2487,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);