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

Commit b2d8e4f0 authored by Guang Zhu's avatar Guang Zhu Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 723462eb to master."

parents 12262af4 d5502258

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

+4 −0
Original line number Diff line number Diff line
@@ -15468,6 +15468,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
                pw.print(" Lost RAM: "); pw.println(stringifyKBSize(memInfo.getTotalSizeKb()

                        - totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()

                        - memInfo.getKernelUsedSizeKb()));

            } else {

                pw.print("lostram,"); pw.println(memInfo.getTotalSizeKb()

                        - totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()

                        - memInfo.getKernelUsedSizeKb());

            }

            if (!brief) {

                if (memInfo.getZramTotalSizeKb() != 0) {