Merge "Fix Lost RAM calculation by accounting for ION mapped heaps" into rvc-dev (49644a34) · Commits · e / os / android_frameworks_base

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(