From f51c745845c71e8871aa25212515e88abc72f711 Mon Sep 17 00:00:00 2001
From: Alex Hong <rurumihong@google.com>
Date: Fri, 6 Jan 2023 20:16:58 +0800
Subject: [PATCH] sdm710-common: device: Replace the HIDL with AIDL for
 android.hardware.memtrack

The HIDL interface of "android.hardware.memtrack" is no longer supported
for Android S.

Test: atest VtsHalMemtrackTargetTest pass
Bug: 186539435
Change-Id: Iaafd526fc5a601f7e8189ec764399d99c660beb0
---
 manifest.xml | 10 ----------
 sdm710.mk    |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 52f89f8..151f5ee 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -19,16 +19,6 @@
         </interface>
         <fqname>@6.0::IEffectsFactory/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.biometrics.fingerprint</name>
         <transport>hwbinder</transport>
diff --git a/sdm710.mk b/sdm710.mk
index 0792832..9a6309e 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -161,8 +161,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.3-service \
     android.hardware.graphics.mapper@2.0-impl-qti-display \
-    android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service \
+    android.hardware.memtrack-service.example \
     gralloc.sdm710 \
     hwcomposer.sdm710 \
     libdisplayconfig.qti \