commit dbea722f1e388bae5976c6a5eca0508044cbf194
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 16 18:29:26 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 18:29:26 2024 +0000
tree c428be984509950521ac7fbab508d599b7e12d59
parent 5c82839fae25d73893441c7559bee092c11cb7fa
parent 18849128f20a681212583a85f07420e1604c05a7

Merge "[BugFix][MEM]Fix process memory data during dump" into main

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index d7c43b5..f7a34cc 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12689,7 +12689,7 @@
                         continue;
                     }
                     endTime = SystemClock.currentThreadTimeMillis();
-                    hasSwapPss = mi.hasSwappedOutPss;
+                    hasSwapPss = hasSwapPss || mi.hasSwappedOutPss;
                     memtrackGraphics = mi.getOtherPrivate(Debug.MemoryInfo.OTHER_GRAPHICS);
                     memtrackGl = mi.getOtherPrivate(Debug.MemoryInfo.OTHER_GL);
                 } else {
@@ -13367,7 +13367,7 @@
                     continue;
                 }
                 endTime = SystemClock.currentThreadTimeMillis();
-                hasSwapPss = mi.hasSwappedOutPss;
+                hasSwapPss = hasSwapPss || mi.hasSwappedOutPss;
             } else {
                 reportType = ProcessStats.ADD_PSS_EXTERNAL;
                 startTime = SystemClock.currentThreadTimeMillis();