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

Commit 5744efec authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "Fix Lost RAM calculation by accounting for ION mapped heaps" into rvc-dev am: 49644a34 

Change-Id: Ie30d85e88a27d91b3758858b9690b80fbb09d4f8
parents 5acf6c57 49644a34

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

+6 −2
Original line number Diff line number Diff line
@@ -13597,7 +13597,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        pw.print(" unmapped + ");

                        pw.print(stringifyKBSize(ionPool));

                        pw.println(" pools)");

                kernelUsed += ionUnmapped;

                // Note: mapped ION memory is not accounted in PSS due to VM_PFNMAP flag being

                // set on ION VMAs, therefore consider the entire ION heap as used kernel memory

                kernelUsed += ionHeap;

            }

            final long lostRAM = memInfo.getTotalSizeKb() - (totalPss - totalSwapPss)

                    - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()
@@ -14403,7 +14405,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
            memInfoBuilder.append("       ION: ");

            memInfoBuilder.append(stringifyKBSize(ionHeap + ionPool));

            memInfoBuilder.append("\n");

            kernelUsed += ionUnmapped;

            // Note: mapped ION memory is not accounted in PSS due to VM_PFNMAP flag being

            // set on ION VMAs, therefore consider the entire ION heap as used kernel memory

            kernelUsed += ionHeap;

        }

        memInfoBuilder.append("  Used RAM: ");

        memInfoBuilder.append(stringifyKBSize(