commit c30cfa0bc21b9e9c9a0520f99b85922670ddf100
author Jing Ji <jji@google.com> Thu Apr 27 01:13:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 27 01:13:59 2023 +0000
tree 24fbcdcac0727b7c34058a9d03181483965d7787
parent f4126ea6512cc42a2bc8767f7a7b8f38a73024b2
parent 176464adc22cbb9128f8b76e5d9f99d9eb177eef

Merge "Move the cached app high watermark logging before the modern trim flag" into udc-dev

services/core/java/com/android/server/am/AppProfiler.java

diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java
index f29a2e1..c687184a 100644
--- a/services/core/java/com/android/server/am/AppProfiler.java
+++ b/services/core/java/com/android/server/am/AppProfiler.java
@@ -1199,6 +1199,9 @@
                     .sendToTarget();
         }
 
+        mCachedAppsWatermarkData.updateCachedAppsHighWatermarkIfNecessaryLocked(
+                numCached + numEmpty, now);
+
         if (mService.mConstants.USE_MODERN_TRIM) {
             // Modern trim is not sent based on lowmem state
             // Dispatch UI_HIDDEN to processes that need it
@@ -1316,8 +1319,6 @@
                 profile.setTrimMemoryLevel(0);
             });
         }
-        mCachedAppsWatermarkData.updateCachedAppsHighWatermarkIfNecessaryLocked(
-                numCached + numEmpty, now);
         return allChanged;
     }