commit 633ce78b940dec2138e3678bc65ddfac59c0cd2c
author Suren Baghdasaryan <surenb@google.com> Fri Sep 09 16:55:25 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 09 16:55:25 2022 +0000
tree b68207f4e35a6f7169396d32fe91be3e772a874d
parent 2880afb77f3fc6f1daa1788aa8d2bc1bcfee5d3b
parent cfd8864f9a578fd5a316bda0d07c4d74c78e07b6

Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level"

init/extra_free_kbytes.sh

diff --git a/init/extra_free_kbytes.sh b/init/extra_free_kbytes.sh
index aeaa912..a0141be 100755
--- a/init/extra_free_kbytes.sh
+++ b/init/extra_free_kbytes.sh
@@ -77,7 +77,19 @@
     exit
 fi
 
-watermark_scale=`cat /proc/sys/vm/watermark_scale_factor`
+# record the original watermark_scale_factor value
+watermark_scale=$(getprop "ro.kernel.watermark_scale_factor")
+if [ -z "$watermark_scale" ]
+then
+    watermark_scale=$(cat /proc/sys/vm/watermark_scale_factor)
+    setprop "ro.kernel.watermark_scale_factor" "$watermark_scale"
+    # On older distributions with no policies configured setprop may fail.
+    # If that happens, use the kernel default of 10.
+    if [ -z $(getprop "ro.kernel.watermark_scale_factor") ]
+    then
+        watermark_scale=10
+    fi
+fi
 
 # convert extra_free_kbytes to pages
 page_size=$(getconf PAGESIZE)