From aca67768d3845a57a52f7c03fe7ad779c679c949 Mon Sep 17 00:00:00 2001
From: Xin Guan <guanxin@google.com>
Date: Thu, 6 Apr 2023 14:16:27 +0000
Subject: [PATCH] Avoid OOM Adj update for processes with fixed adj.

Ignore the oomAdjUpdate request if the target app is
system/persistent process with fixed adj.

Bug: 226385494
Test: atest MockingOomAdjusterTests
Change-Id: I796298cd6877577394960d944112c843f0a637cc
(cherry picked from commit 3bb2c5e3966595e1bd5d2d8e17f67716f5685607)
---
 services/core/java/com/android/server/am/OomAdjuster.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index 1e5f187fee4ae..85a01851187e3 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -837,7 +837,7 @@ public class OomAdjuster {
      */
     @GuardedBy("mService")
     void enqueueOomAdjTargetLocked(ProcessRecord app) {
-        if (app != null) {
+        if (app != null && app.mState.getMaxAdj() > FOREGROUND_APP_ADJ) {
             mPendingProcessSet.add(app);
         }
     }