commit 0b8b47057e4c9108d2e49b22cded18695dbf75c5
author Suren Baghdasaryan <surenb@google.com> Sat Jul 11 03:18:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jul 11 03:18:24 2020 +0000
tree aa54b2eaf7a63d68ba9e04430af757dcaff21f4d
parent 08d786c5bd3ade7c352e833052a08acd71b9baf5
parent 93060362b5af100246bf3258d83e1a74107b98ab

lmkd: Set default kill timeout to limit waits for uninterruptible processes am: 7d1f4f0047 am: 93060362b5

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

Change-Id: I06968623ad7ea99ee61c001e367d3892249ed3a6

lmkd.cpp

diff --git a/lmkd.cpp b/lmkd.cpp
index 2e0e6f7..c721323 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -3216,7 +3216,7 @@
         property_get_bool("ro.lmk.kill_heaviest_task", false);
     low_ram_device = property_get_bool("ro.config.low_ram", false);
     kill_timeout_ms =
-        (unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 0);
+        (unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 100);
     use_minfree_levels =
         property_get_bool("ro.lmk.use_minfree_levels", false);
     per_app_memcg =