Merge cherrypicks of ['googleplex-android-review.googlesource.com/24948168'] into udc-d2-release.android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release

Change-Id: I68331e6c586147cbe36520a52c6acd7f933c2fde

1 files changed, 10 insertions, 0 deletions

diff --git a/lmkd.cpp b/lmkd.cpp
index fcb06fe..f47982c 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -94,6 +94,7 @@ static inline void trace_kill_end() {}
 #define LINE_MAX 128
 
 #define PERCEPTIBLE_APP_ADJ 200
+#define PREVIOUS_APP_ADJ 700
 
 /* Android Logger event logtags (see event.logtags) */
 #define KILLINFO_LOG_TAG 10195355
@@ -2844,6 +2845,15 @@ static void mp_event_psi(int data, uint32_t events, struct polling_params *poll_
         }
     }
 
+    /* Check if a cached app should be killed */
+    if (kill_reason == NONE && wmark < WMARK_HIGH) {
+        /* TODO: introduce a new kill reason */
+        kill_reason = LOW_MEM_AND_SWAP;
+        snprintf(kill_desc, sizeof(kill_desc), "%s watermark is breached",
+            wmark < WMARK_LOW ? "min" : "low");
+        min_score_adj = PREVIOUS_APP_ADJ + 1;
+    }
+
     /* Kill a process if necessary */
     if (kill_reason != NONE) {
         struct kill_info ki = {