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

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

Merge "Fix regression with OverlayManagerPerfTest" into sc-dev am: d9b723b8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd65d31236409b592a9c888ab3d8c667992a8301
parents 5443d650 d9b723b8

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

+1 −1
Original line number Diff line number Diff line
@@ -4447,7 +4447,7 @@ public final class ProcessList { 
            }



            app.getPkgList().forEachPackage(packageName -> {

                if (updateFrameworkRes && packagesToUpdate.contains(packageName)) {

                if (updateFrameworkRes || packagesToUpdate.contains(packageName)) {

                    try {

                        final ApplicationInfo ai = AppGlobals.getPackageManager()

                                .getApplicationInfo(packageName, STOCK_PM_FLAGS, app.userId);

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

+2 −0
Original line number Diff line number Diff line
@@ -623,6 +623,8 @@ final class ProcessProfileRecord { 
            DebugUtils.printSizeValue(pw, mLastCachedSwapPss * 1024);

            pw.print(" lastRss=");

            DebugUtils.printSizeValue(pw, mLastRss * 1024);

            pw.println();

            pw.print(prefix);

            pw.print(" trimMemoryLevel=");

            pw.println(mTrimMemoryLevel);

            pw.println();