From b555d6c91276a344ef91fd7ed9c41b4f265224a0 Mon Sep 17 00:00:00 2001
From: Roger Fang <rogerfang@google.com>
Date: Thu, 22 Apr 2021 22:19:30 +0800
Subject: [PATCH] device: google: gs101: IAudioMetricExt hidl manifest settings

Bug: 180627405
Test: Manually test

Signed-off-by: Roger Fang <rogerfang@google.com>
Change-Id: If84d94703bdbb3621dc03bdb2101c42bfd4a3c91
---
 device.mk                           | 6 ++++++
 device_framework_matrix_product.xml | 8 ++++++++
 manifest-gralloc3.xml               | 9 +++++++++
 manifest.xml                        | 9 +++++++++
 manifest_64-gralloc3.xml            | 9 +++++++++
 manifest_64.xml                     | 9 +++++++++
 6 files changed, 50 insertions(+)

diff --git a/device.mk b/device.mk
index 7b93f9af..c0d657ca 100644
--- a/device.mk
+++ b/device.mk
@@ -1040,6 +1040,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.audio.monitorRotation = true \
 	ro.audio.offload_wakelock=false
 
+ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+# IAudioMetricExt HIDL
+PRODUCT_PACKAGES += \
+    vendor.google.audiometricext@1.0-service-vendor
+endif
+
 # vndservicemanager and vndservice no longer included in API 30+, however needed by vendor code.
 # See b/148807371 for reference
 PRODUCT_PACKAGES += vndservicemanager
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 92a730a1..71eb48ba 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -173,4 +173,12 @@
             <instance>rilExternal</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+       <name>vendor.google.audiometricext</name>
+       <version>1.0</version>
+       <interface>
+           <name>IAudioMetricExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
 </compatibility-matrix>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 8cadaba5..5f416b93 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -218,5 +218,14 @@
            <instance>default</instance>
        </interface>
     </hal>
+    <hal format="hidl">
+       <name>vendor.google.audiometricext</name>
+       <transport>hwbinder</transport>
+       <version>1.0</version>
+       <interface>
+           <name>IAudioMetricExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
     <kernel target-level="6"/>
 </manifest>
diff --git a/manifest.xml b/manifest.xml
index a4594f5e..9dae894a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -178,5 +178,14 @@
            <instance>default</instance>
        </interface>
     </hal>
+    <hal format="hidl">
+       <name>vendor.google.audiometricext</name>
+       <transport>hwbinder</transport>
+       <version>1.0</version>
+       <interface>
+           <name>IAudioMetricExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
     <kernel target-level="6"/>
 </manifest>
diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml
index 820a8b4d..81e8761e 100644
--- a/manifest_64-gralloc3.xml
+++ b/manifest_64-gralloc3.xml
@@ -207,5 +207,14 @@
            <instance>default</instance>
        </interface>
     </hal>
+    <hal format="hidl">
+       <name>vendor.google.audiometricext</name>
+       <transport>hwbinder</transport>
+       <version>1.0</version>
+       <interface>
+           <name>IAudioMetricExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
     <kernel target-level="6"/>
 </manifest>
diff --git a/manifest_64.xml b/manifest_64.xml
index 9ba0130c..bca4cffb 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -170,5 +170,14 @@
            <instance>default</instance>
        </interface>
     </hal>
+    <hal format="hidl">
+       <name>vendor.google.audiometricext</name>
+       <transport>hwbinder</transport>
+       <version>1.0</version>
+       <interface>
+           <name>IAudioMetricExt</name>
+           <instance>default</instance>
+       </interface>
+    </hal>
     <kernel target-level="6"/>
 </manifest>