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: Iee2254c3047d939a82bbaf7de9e350ea1df4ea20
This commit is contained in:
Martin Liu 2020-06-02 20:55:29 +00:00 committed by Automerger Merge Worker
commit 62f4f4262e
1 changed files with 2 additions and 2 deletions

View File

@ -2387,7 +2387,7 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
"kB < %" PRId64 "kB) and thrashing (%" PRId64 "%%)", "kB < %" PRId64 "kB) and thrashing (%" PRId64 "%%)",
mi.field.free_swap * page_k, swap_low_threshold * page_k, thrashing); mi.field.free_swap * page_k, swap_low_threshold * page_k, thrashing);
/* Do not kill perceptible apps unless below min watermark */ /* Do not kill perceptible apps unless below min watermark */
if (wmark < WMARK_LOW) { if (wmark > WMARK_MIN) {
min_score_adj = PERCEPTIBLE_APP_ADJ + 1; min_score_adj = PERCEPTIBLE_APP_ADJ + 1;
} }
} else if (swap_is_low && wmark < WMARK_HIGH) { } else if (swap_is_low && wmark < WMARK_HIGH) {
@ -2397,7 +2397,7 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
PRId64 "kB < %" PRId64 "kB)", wmark > WMARK_LOW ? "min" : "low", PRId64 "kB < %" PRId64 "kB)", wmark > WMARK_LOW ? "min" : "low",
mi.field.free_swap * page_k, swap_low_threshold * page_k); mi.field.free_swap * page_k, swap_low_threshold * page_k);
/* Do not kill perceptible apps unless below min watermark */ /* Do not kill perceptible apps unless below min watermark */
if (wmark < WMARK_LOW) { if (wmark > WMARK_MIN) {
min_score_adj = PERCEPTIBLE_APP_ADJ + 1; min_score_adj = PERCEPTIBLE_APP_ADJ + 1;
} }
} else if (wmark < WMARK_HIGH && thrashing > thrashing_limit) { } else if (wmark < WMARK_HIGH && thrashing > thrashing_limit) {