Merge "Fix a regression in setting oom_adj for cached processes" into qt-dev

am: 4025715b3e Change-Id: Ic9f15ba600f34307d31c88eb11017e5a59f79ea8
2019-06-26 20:05:43 -07:00
parent c982441edb 4025715b3e
commit 40d13af878
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -431,7 +431,7 @@ public final class OomAdjuster {
            for (int i = 0; i < N; i++) {
                ProcessRecord app = mProcessList.mLruProcesses.get(i);
                if (!app.killedByAm && app.thread != null && app.containsCycle == true) {
-                    if (computeOomAdjLocked(app, ProcessList.UNKNOWN_ADJ, TOP_APP, true, now,
+                    if (computeOomAdjLocked(app, app.getCurRawAdj(), TOP_APP, true, now,
                            true)) {
                        retryCycles = true;
                    }