From 69bc91e5f07e3728e008b18f28f5ce6c2b20325c Mon Sep 17 00:00:00 2001
From: Alex Hong <rurumihong@google.com>
Date: Tue, 4 May 2021 00:37:05 +0800
Subject: [PATCH] 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
---
 device.mk    | 5 ++---
 manifest.xml | 9 ---------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/device.mk b/device.mk
index a9cb7f0a..24c4f687 100644
--- a/device.mk
+++ b/device.mk
@@ -415,10 +415,9 @@ else
 		gralloc.$(TARGET_BOARD_PLATFORM)
 endif
 
-# HIDL memtrack
+# AIDL memtrack
 PRODUCT_PACKAGES += \
-	android.hardware.memtrack@1.0-impl \
-	android.hardware.memtrack@1.0-service
+	android.hardware.memtrack-service.example
 
 PRODUCT_PACKAGES += \
 	memtrack.$(TARGET_BOARD_PLATFORM) \
diff --git a/manifest.xml b/manifest.xml
index 81b21ea4..4f56564e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -66,15 +66,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.memtrack</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMemtrack</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.renderscript</name>
         <transport arch="32+64">passthrough</transport>