commit 522531b1e1a005410e917f3d64488a1fb9f7d05a
author Suren Baghdasaryan <surenb@google.com> Sat Apr 14 16:14:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Sat Apr 14 16:14:42 2018 -0700
tree 77c8b55fdb2e8ddf7389144a99801d0c17322f7b
parent af9767fc6295f162f463fc9a1d58253718e8e128
parent 203fb66f07c4139629d25bebbb798f1c3c18c03c

Merge changes I78d2dc79,I6e2eaebe
am: bb266150fe

Change-Id: I1d9afb8b0100f48fe1a75e27cdb1db5ad4e18f50

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index f7c90ec..4c98a35 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -110,7 +110,7 @@
 static bool enable_pressure_upgrade;
 static int64_t upgrade_pressure;
 static int64_t downgrade_pressure;
-static bool is_go_device;
+static bool low_ram_device;
 static bool kill_heaviest_task;
 static unsigned long kill_timeout_ms;
 
@@ -788,10 +788,8 @@
         struct proc *procp;
 
         while (true) {
-            if (is_go_device)
-                procp = proc_adj_lru(i);
-            else
-                procp = proc_get_heaviest(i);
+            procp = kill_heaviest_task ?
+                proc_get_heaviest(i) : proc_adj_lru(i);
 
             if (!procp)
                 break;
@@ -966,7 +964,7 @@
     }
 
 do_kill:
-    if (is_go_device) {
+    if (low_ram_device) {
         /* For Go devices kill only one task */
         if (find_and_kill_processes(level, 0) == 0) {
             if (debug_process_killing) {
@@ -1202,8 +1200,8 @@
     downgrade_pressure =
         (int64_t)property_get_int32("ro.lmk.downgrade_pressure", 100);
     kill_heaviest_task =
-        property_get_bool("ro.lmk.kill_heaviest_task", true);
-    is_go_device = property_get_bool("ro.config.low_ram", false);
+        property_get_bool("ro.lmk.kill_heaviest_task", false);
+    low_ram_device = property_get_bool("ro.config.low_ram", false);
     kill_timeout_ms =
         (unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 0);