Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jing Ji
2023-01-17 03:21:20 +00:00
committed by Automerger Merge Worker
parent 46de3c9ee7 2d361f6350
commit 5b474f61a2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/OomAdjuster.java
View File

@@ -2457,7 +2457,7 @@ public class OomAdjuster {
} }
state.setCurRawAdj(adj); state.setCurRawAdj(adj);
adj = psr.modifyRawOomAdj(adj);
if (adj > state.getMaxAdj()) { if (adj > state.getMaxAdj()) {
adj = state.getMaxAdj(); adj = state.getMaxAdj();
if (adj <= ProcessList.PERCEPTIBLE_LOW_APP_ADJ) { 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 // 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 // worry about this for max adj above, since max adj will always be used to
// keep it out of the cached vaues. // keep it out of the cached vaues.
state.setCurAdj(psr.modifyRawOomAdj(adj)); state.setCurAdj(adj);
state.setCurCapability(capability); state.setCurCapability(capability);
state.setCurrentSchedulingGroup(schedGroup); state.setCurrentSchedulingGroup(schedGroup);
state.setCurProcState(procState); state.setCurProcState(procState);