From 176464adc22cbb9128f8b76e5d9f99d9eb177eef Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Wed, 26 Apr 2023 15:23:56 -0700
Subject: [PATCH] Move the cached app high watermark logging before the modern
 trim flag

Since we have the flag on by default now.

Bug: 276460611
Test: adb shell cmd stats pull-source 10189
Change-Id: I543b4467b2347b2f7165e8ba1efdb70a88bd1cd6
---
 services/core/java/com/android/server/am/AppProfiler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java
index f29a2e1ee7dac..c687184a5a718 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 @@ public class AppProfiler {
                     .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 @@ public class AppProfiler {
                 profile.setTrimMemoryLevel(0);
             });
         }
-        mCachedAppsWatermarkData.updateCachedAppsHighWatermarkIfNecessaryLocked(
-                numCached + numEmpty, now);
         return allChanged;
     }