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

Commit 74286e44 authored by Ioannis Ilkos's avatar Ioannis Ilkos Committed by Android (Google) Code Review
Browse files

Merge "Add total shmem to SystemMemory atom"

parents 5479e1e0 5a45327a

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+2 −1
Original line number Diff line number Diff line
@@ -2392,7 +2392,8 @@ public class StatsPullAtomService extends SystemService { 
                        metrics.unaccountedKb,

                        metrics.gpuTotalUsageKb,

                        metrics.gpuPrivateAllocationsKb,

                        metrics.dmaBufTotalExportedKb));

                        metrics.dmaBufTotalExportedKb,

                        metrics.shmemKb));

        return StatsManager.PULL_SUCCESS;

    }

services/core/java/com/android/server/stats/pull/SystemMemoryUtil.java

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ final class SystemMemoryUtil { 
        result.vmallocUsedKb = (int) mInfos[Debug.MEMINFO_VM_ALLOC_USED];

        result.pageTablesKb = (int) mInfos[Debug.MEMINFO_PAGE_TABLES];

        result.kernelStackKb = (int) mInfos[Debug.MEMINFO_KERNEL_STACK];

        result.shmemKb = (int) mInfos[Debug.MEMINFO_SHMEM];

        result.totalIonKb = totalIonKb;

        result.gpuTotalUsageKb = gpuTotalUsageKb;

        result.gpuPrivateAllocationsKb = gpuPrivateAllocationsKb;
@@ -95,6 +96,7 @@ final class SystemMemoryUtil { 
        public int vmallocUsedKb;

        public int pageTablesKb;

        public int kernelStackKb;

        public int shmemKb;

        public int totalIonKb;

        public int gpuTotalUsageKb;

        public int gpuPrivateAllocationsKb;