From ee6412ebf0311236ff055c3af471f10e65816b14 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 25 Jun 2024 20:13:06 +0000 Subject: [PATCH] Revert "lmkd: change default lowmem_min_oom_score for low-RAM devices" This reverts commit 686abc4e2b31c4f3c8378848af732f47ca10c20f. Reason for revert: regressing wear device tests Bug: 349256852 Change-Id: I6c38c11dcad38bfba93609f476745513798c8e0b --- README.md | 5 ++--- lmkd.cpp | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4f08488..b5748d4 100644 --- a/README.md +++ b/README.md @@ -104,9 +104,8 @@ properties: to kill when memory is critically low. Setting it to 1001 will prevent any kills for this reason. Min acceptable value is 201 (apps up to perceptible). - Default for low-RAM devices = 1001 (disabled), for - high-end devices = 701 (all cached apps excluding - the last active one). + Default = 701 (all cached apps excluding the last + active one). lmkd will set the following Android properties according to current system configurations: diff --git a/lmkd.cpp b/lmkd.cpp index a698c6d..2a0f69b 100644 --- a/lmkd.cpp +++ b/lmkd.cpp @@ -169,7 +169,6 @@ static inline void trace_kill_end() {} /* ro.lmk.swap_compression_ratio property defaults */ #define DEF_SWAP_COMP_RATIO 1 /* ro.lmk.lowmem_min_oom_score defaults */ -#define DEF_LOWMEM_MIN_SCORE_LOWRAM (OOM_SCORE_ADJ_MAX + 1) #define DEF_LOWMEM_MIN_SCORE (PREVIOUS_APP_ADJ + 1) #define LMKD_REINIT_PROP "lmkd.reinit" @@ -4231,10 +4230,9 @@ static bool update_props() { GET_LMK_PROPERTY(int64, "direct_reclaim_threshold_ms", DEF_DIRECT_RECL_THRESH_MS); swap_compression_ratio = GET_LMK_PROPERTY(int64, "swap_compression_ratio", DEF_SWAP_COMP_RATIO); - lowmem_min_oom_score = std::max( - PERCEPTIBLE_APP_ADJ + 1, - GET_LMK_PROPERTY(int32, "lowmem_min_oom_score", - low_ram_device ? DEF_LOWMEM_MIN_SCORE_LOWRAM : DEF_LOWMEM_MIN_SCORE)); + lowmem_min_oom_score = + std::max(PERCEPTIBLE_APP_ADJ + 1, + GET_LMK_PROPERTY(int32, "lowmem_min_oom_score", DEF_LOWMEM_MIN_SCORE)); reaper.enable_debug(debug_process_killing);