commit 30f661769fe6a930709ed69580d79d477b69787e
author Vic Yang <victoryang@google.com> Wed Feb 20 13:10:17 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 13:10:17 2019 -0800
tree e171761c37c2e68aeb74501c7e8a733f491d1baa
parent dadf57a108d6271ec7714e7dcabfd7b64c544881
parent 2f359a7951c5b74e80e4e61ce9e70423a47c69a2

Merge "libprocessgroup: Fix memcg path for apps" am: 1cae1b0f81
am: 8a4f601c11

Change-Id: I1880dffa5b056d56620b1dff37f0a65b27a8379e

libprocessgroup/processgroup.cpp

diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp
index e9dec12..8505e61 100644
--- a/libprocessgroup/processgroup.cpp
+++ b/libprocessgroup/processgroup.cpp
@@ -200,7 +200,7 @@
         cgroups.push_back(path);
     }
     if (CgroupGetControllerPath("memory", &path)) {
-        cgroups.push_back(path);
+        cgroups.push_back(path + "/apps");
     }
 
     for (std::string cgroup_root_path : cgroups) {
@@ -317,6 +317,7 @@
 
     CgroupGetControllerPath("cpuacct", &cpuacct_path);
     CgroupGetControllerPath("memory", &memory_path);
+    memory_path += "/apps";
 
     const char* cgroup =
             (!access(ConvertUidPidToPath(cpuacct_path.c_str(), uid, initialPid).c_str(), F_OK))
@@ -380,6 +381,7 @@
     std::string cgroup;
     if (isMemoryCgroupSupported() && (memControl || UsePerAppMemcg())) {
         CgroupGetControllerPath("memory", &cgroup);
+        cgroup += "/apps";
     } else {
         CgroupGetControllerPath("cpuacct", &cgroup);
     }