commit 3185c2d09654c80e0fbad36674afdbd78c999334
author Martin Liu <liumartin@google.com> Tue Jun 02 13:05:51 2020 +0800
committer Martin Liu <liumartin@google.com> Tue Jun 02 23:43:49 2020 +0800
tree 46fdaf078d7f8ec39f3ea08b2f941580c4d2f61f
parent d6d8a3dc55d00645da1b7da89f07b76b4413d4ff

lmkd: Fix do not kill perceptible apps due to low swap if above min wmark

Fix code logic to obey our intetion of not killing perceptible apps
due to low swap if above min wmark.

Bug: 155709603
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: Ifc09c2a1fe7e21faa096988f471644f63951d81c
Change-Id: Ifc09c2a1fe7e21faa096988f471644f63951d81c

lmkd.cpp

diff --git a/lmkd.cpp b/lmkd.cpp
index 8cef9f1..2e0e6f7 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -2397,7 +2397,7 @@
             "kB < %" PRId64 "kB) and thrashing (%" PRId64 "%%)",
             mi.field.free_swap * page_k, swap_low_threshold * page_k, thrashing);
         /* Do not kill perceptible apps unless below min watermark */
-        if (wmark < WMARK_LOW) {
+        if (wmark > WMARK_MIN) {
             min_score_adj = PERCEPTIBLE_APP_ADJ + 1;
         }
     } else if (swap_is_low && wmark < WMARK_HIGH) {
@@ -2407,7 +2407,7 @@
             PRId64 "kB < %" PRId64 "kB)", wmark > WMARK_LOW ? "min" : "low",
             mi.field.free_swap * page_k, swap_low_threshold * page_k);
         /* Do not kill perceptible apps unless below min watermark */
-        if (wmark < WMARK_LOW) {
+        if (wmark > WMARK_MIN) {
             min_score_adj = PERCEPTIBLE_APP_ADJ + 1;
         }
     } else if (wmark < WMARK_HIGH && swap_util_max < 100 &&