Merge "Use isolated uid to set oom_score_adj" into oc-mr1-dev

2017-08-31 03:52:51 +00:00
parent e61844e265 72be3d3753
commit d60e2ede49
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -21937,7 +21937,7 @@ public class ActivityManagerService extends IActivityManager.Stub
        int changes = 0;

        if (app.curAdj != app.setAdj) {
-            ProcessList.setOomAdj(app.pid, app.info.uid, app.curAdj);
+            ProcessList.setOomAdj(app.pid, app.uid, app.curAdj);
            if (DEBUG_SWITCH || DEBUG_OOM_ADJ) Slog.v(TAG_OOM_ADJ,
                    "Set " + app.pid + " " + app.processName + " adj " + app.curAdj + ": "
                    + app.adjType);