| commit | 561c1e8a13e412daff98215ac837ba608241baf5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 16 18:51:11 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 16 18:51:11 2024 +0000 |
| tree | 9159ac6d46e347e7076f1b644cee06c63e6d3162 | |
| parent | 9b4a5a34eaf2a4dcf56b7d25ed6c88ce2daf5b4a [diff] | |
| parent | dbea722f1e388bae5976c6a5eca0508044cbf194 [diff] |
Merge "[BugFix][MEM]Fix process memory data during dump" into main am: dbea722f1e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2855566 Change-Id: I230a933e24b400d1731c4b8421b058c52bbf7088 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();