Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix regression with OverlayManagerPerfTest" into sc-dev

Browse Source
This commit is contained in:
Jing Ji
2021-02-02 03:02:27 +00:00
committed by Android (Google) Code Review
parent 9c4c212239 af7ea99914
commit d9b723b847
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -4447,7 +4447,7 @@ public final class ProcessList {
} }
app.getPkgList().forEachPackage(packageName -> { app.getPkgList().forEachPackage(packageName -> {
if (updateFrameworkRes && packagesToUpdate.contains(packageName)) { if (updateFrameworkRes || packagesToUpdate.contains(packageName)) {
try { try {
final ApplicationInfo ai = AppGlobals.getPackageManager() final ApplicationInfo ai = AppGlobals.getPackageManager()
.getApplicationInfo(packageName, STOCK_PM_FLAGS, app.userId); .getApplicationInfo(packageName, STOCK_PM_FLAGS, app.userId);

2
services/core/java/com/android/server/am/ProcessProfileRecord.java
View File

@@ -623,6 +623,8 @@ final class ProcessProfileRecord {
DebugUtils.printSizeValue(pw, mLastCachedSwapPss * 1024); DebugUtils.printSizeValue(pw, mLastCachedSwapPss * 1024);
pw.print(" lastRss="); pw.print(" lastRss=");
DebugUtils.printSizeValue(pw, mLastRss * 1024); DebugUtils.printSizeValue(pw, mLastRss * 1024);
pw.println();
pw.print(prefix);
pw.print(" trimMemoryLevel="); pw.print(" trimMemoryLevel=");
pw.println(mTrimMemoryLevel); pw.println(mTrimMemoryLevel);
pw.println(); pw.println();