Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f15def authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Move the cached app high watermark logging before the modern trim flag"... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22897844



Change-Id: Iffccbb5255bdbccd3472c2000990a9e6899abcf4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d425134 09177545

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

+3 −2
Original line number Diff line number Diff line
@@ -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;

    }