diff options
author | Martin Liu <liumartin@google.com> | 2020-06-02 21:01:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 21:01:39 +0000 |
commit | f6dc513ad77f32447c916edbdbed4955d1624c93 (patch) | |
tree | 717cb0f2e6c61f039055865a0cde22505ad5cde1 | |
parent | b286ce53766861ad1910d04beb5fafb18e6333bc (diff) | |
parent | dfc73bc2fe5d0fa2fa4a8caa9522a1419453485b (diff) | |
download | lmkd-f6dc513ad77f32447c916edbdbed4955d1624c93.tar.gz |
lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2feandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841
Change-Id: I4fc231e488289620dd00a37d1f19de9460a15af8
-rw-r--r-- | lmkd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2387,7 +2387,7 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_ "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 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_ 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) { |