commit 736260f21065f973acc95e27a3f2603a3b2f5963
author Suren Baghdasaryan <surenb@google.com> Fri Aug 03 09:14:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 03 09:14:09 2018 -0700
tree f76509395261b74f2bd9f42705e6c1c19cd37440
parent 671c29256dd9323949d6506e4023ea9a276c8738
parent 4440d0b706e9bd9294811505370844534a5dda28

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

Change-Id: I57f3142ed217d4f1b3edb526087076fc588354d7

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 467eb2f..8fda563 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -115,6 +115,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 {
@@ -481,7 +482,7 @@
         return;
     }
 
-    if (low_ram_device) {
+    if (per_app_memcg) {
         if (params.oomadj >= 900) {
             soft_limit_mult = 0;
         } else if (params.oomadj >= 800) {
@@ -1577,6 +1578,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);
 
 #ifdef LMKD_LOG_STATS
     statslog_init(&log_ctx, &enable_stats_log);