commit 4440d0b706e9bd9294811505370844534a5dda28
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 03 16:07:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 03 16:07:24 2018 +0000
tree 3f4861856683e6c0ddac7cebaedca1d6b09b39c7
parent 9e2d788e15e147a93733788ee73cc372ad2141fc
parent 352d3f93050b6704207401af8e60f7c9b486fd1f

Merge "lmkd: Disable memory.stat usage when per-application memcgs are not used"

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index c2487d6..e7c13e0 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -111,6 +111,7 @@
 static bool kill_heaviest_task;
 static unsigned long kill_timeout_ms;
 static bool use_minfree_levels;
+static bool per_app_memcg;
 
 /* data required to handle events */
 struct event_handler_info {
@@ -472,7 +473,7 @@
         return;
     }
 
-    if (low_ram_device) {
+    if (per_app_memcg) {
         if (params.oomadj >= 900) {
             soft_limit_mult = 0;
         } else if (params.oomadj >= 800) {
@@ -1481,6 +1482,8 @@
         (unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 0);
     use_minfree_levels =
         property_get_bool("ro.lmk.use_minfree_levels", false);
+    per_app_memcg =
+        property_get_bool("ro.config.per_app_memcg", low_ram_device);
 
     if (!init()) {
         if (!use_inkernel_interface) {