From af7ea99914f0c05887cabad7f9505991fc8e122f Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Mon, 1 Feb 2021 12:14:07 -0800
Subject: [PATCH] Fix regression with OverlayManagerPerfTest

Also fixed a regression with ActivityManagerAppExitInfoTest

Bug: 179054146
Bug: 178978839
Bug: 179052239
Test: atest OverlayManagerPerfTest
Test: atest ConfigChangeTests
Test: atest ActivityManagerAppExitInfoTest
Change-Id: I438e91f22bf5adea8b14ecac1295d3f32586aa33
---
 services/core/java/com/android/server/am/ProcessList.java       | 2 +-
 .../core/java/com/android/server/am/ProcessProfileRecord.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index a768532a9260e..bbf927b1ee2da 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -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);
diff --git a/services/core/java/com/android/server/am/ProcessProfileRecord.java b/services/core/java/com/android/server/am/ProcessProfileRecord.java
index cf309f4c8e3de..9fd2bd798c044 100644
--- a/services/core/java/com/android/server/am/ProcessProfileRecord.java
+++ b/services/core/java/com/android/server/am/ProcessProfileRecord.java
@@ -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();