commit e8df588df05eba1f7f8946c88449332b41e87eeb
author Suren Baghdasaryan <surenb@google.com> Sat Apr 14 17:21:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Sat Apr 14 17:21:53 2018 -0700
tree 54a8c41f3591afd1ca36833cc2405dbcfc7b8774
parent ca592dd2cf12206bc3fff80d2ff805a803aabd8e
parent 66077709680305343c08a34a2db263971c4ca6c2

Merge changes I78d2dc79,I6e2eaebe am: bb266150fe am: 4d41a1f882
am: 6607770968

Change-Id: I22db50c6e56549582dd8c8dfcda9794d3989a17c

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index d8ad020..9fb5216 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -117,7 +117,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;
 
@@ -801,10 +801,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;
@@ -992,7 +990,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) {
@@ -1228,8 +1226,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);