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

Commit dbea722f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 5c82839f 18849128

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

+2 −2
Original line number Diff line number Diff line
@@ -12689,7 +12689,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        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 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    continue;

                }

                endTime = SystemClock.currentThreadTimeMillis();

                hasSwapPss = mi.hasSwappedOutPss;

                hasSwapPss = hasSwapPss || mi.hasSwappedOutPss;

            } else {

                reportType = ProcessStats.ADD_PSS_EXTERNAL;

                startTime = SystemClock.currentThreadTimeMillis();