From b6131463204a51c451fcb94359203d70adbeb9f2 Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Sat, 13 Jul 2024 23:22:02 +0530
Subject: [PATCH] sm6225-common: Switch to QTI Memtrack AIDL HAL

Change-Id: Ibcbaff02fd56fbccc3a88c01a5f46a89cb212ef5
---
 bengal.mk    |  8 +++-----
 manifest.xml | 10 ----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/bengal.mk b/bengal.mk
index f00ef59..21868d1 100644
--- a/bengal.mk
+++ b/bengal.mk
@@ -140,14 +140,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
     android.hardware.graphics.mapper@4.0-impl-qti-display \
-    android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service \
     vendor.qti.hardware.display.allocator-service \
     vendor.qti.hardware.display.composer-service
 
 PRODUCT_PACKAGES += \
-    gralloc.bengal \
-    memtrack.bengal
+    gralloc.bengal
 
 PRODUCT_PACKAGES += \
     init.qti.display_boot.sh \
@@ -163,7 +160,8 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.display.mapper@1.1.vendor \
     vendor.qti.hardware.display.mapper@2.0.vendor \
     vendor.qti.hardware.display.mapper@3.0.vendor \
-    vendor.qti.hardware.display.mapper@4.0.vendor
+    vendor.qti.hardware.display.mapper@4.0.vendor \
+    vendor.qti.hardware.memtrack-service
 
 # DRM
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index a716b3d..01bcb29 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -94,16 +94,6 @@
         <fqname>@1.0::IOmx/default</fqname>
         <fqname>@1.0::IOmxStore/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.memtrack</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMemtrack</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IMemtrack/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>