From eaf50d817b21222668e81b6323b95b2c5d18c12e Mon Sep 17 00:00:00 2001
From: Ioannis Ilkos <ilkos@google.com>
Date: Fri, 12 Mar 2021 16:58:55 +0000
Subject: [PATCH] Switch the SystemMemory atom to use the dmabuf interface for
 ion

Newer devices will migrate and disable ion support altogether.
The dmabuf interface will fallback to ion after aosp/1619803.

Test: manual test
Change-Id: I0f882d264f22245d7535850e3157e2e65d49984e
Bug: 167709539
---
 .../java/com/android/server/stats/pull/SystemMemoryUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/stats/pull/SystemMemoryUtil.java b/services/core/java/com/android/server/stats/pull/SystemMemoryUtil.java
index 628c1d61ce9a6..9f8b27f5f1bfb 100644
--- a/services/core/java/com/android/server/stats/pull/SystemMemoryUtil.java
+++ b/services/core/java/com/android/server/stats/pull/SystemMemoryUtil.java
@@ -26,7 +26,7 @@ final class SystemMemoryUtil {
     private SystemMemoryUtil() {}
 
     static Metrics getMetrics() {
-        int totalIonKb = (int) Debug.getIonHeapsSizeKb();
+        int totalIonKb = (int) Debug.getDmabufHeapTotalExportedKb();
         int gpuTotalUsageKb = (int) Debug.getGpuTotalUsageKb();
         int gpuDmaBufUsageKb = (int) Debug.getGpuDmaBufUsageKb();
         int dmaBufTotalExportedKb = (int) Debug.getDmabufTotalExportedKb();