From 72be3d37539d1cc45cbc8d23a6484d4d157a8743 Mon Sep 17 00:00:00 2001 From: Kenichi Ishibashi Date: Tue, 29 Aug 2017 11:17:29 +0900 Subject: [PATCH] Use isolated uid to set oom_score_adj When a service is isolated, ProcessRecord.uid is different from ProcessRecord.info.uid. We should use the former to set oom_score_adj. Otherwize, lmkd fails to set memory.soft_limit_in_bytes for isolated processes. Bug: 64656396 Test: tested on gobo Change-Id: I81fb1cf64f4680355365ad715b7c0ecd7ac560ed --- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 9727092ed1be4..a4ba150c2d2d6 100644 --- 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);