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"

Browse Source
This commit is contained in:
Jing Ji
2023-01-17 02:46:16 +00:00
committed by Gerrit Code Review
parent 0a84b51762 0ca05d2ffd
commit 2d361f6350
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

@@ -2428,7 +2428,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) {
@@ -2458,7 +2458,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);