commit f6dc513ad77f32447c916edbdbed4955d1624c93
author Martin Liu <liumartin@google.com> Tue Jun 02 21:01:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 02 21:01:39 2020 +0000
tree 717cb0f2e6c61f039055865a0cde22505ad5cde1
parent b286ce53766861ad1910d04beb5fafb18e6333bc
parent dfc73bc2fe5d0fa2fa4a8caa9522a1419453485b

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I4fc231e488289620dd00a37d1f19de9460a15af8

lmkd.cpp

diff --git a/lmkd.cpp b/lmkd.cpp
index 098fe9f..882ae4a 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -2387,7 +2387,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) {
@@ -2397,7 +2397,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 && thrashing > thrashing_limit) {