Remove Soundtrigger HIDL interface from cuttlefish
cuttlefish doesn't have soundtrigger hardware and lacks
the corresponding vendor binary module. Leaving the HIDL
interface for soundtrigger was causing soundtrigger
middleware to believe that something is wrong with the
HAL and perform unneeded restart of audio HAL service
during device boot.
Bug: 151795571
Bug: 159966243
Test: verify that cuttlefish device boots and audio server
and HAL do not get restarted during the boot
Change-Id: I2ba4bbd125f3697601566208b48a7220cea86bac
Merged-In: I2ba4bbd125f3697601566208b48a7220cea86bac
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 484952b..0e500d2 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -230,6 +230,7 @@
</interface>
</hal>
-->
+ <!--
<hal format="hidl">
<name>android.hardware.soundtrigger</name>
<transport>hwbinder</transport>
@@ -239,6 +240,7 @@
<instance>default</instance>
</interface>
</hal>
+ -->
<!-- TODO (b/130079321):
<hal format="hidl">
<name>android.hardware.tetheroffload.config</name>
diff --git a/shared/device.mk b/shared/device.mk
index 377db3b..4e8c8a7 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -285,7 +285,6 @@
android.hardware.audio@6.0-impl:32 \
android.hardware.audio.effect@6.0-impl:32 \
android.hardware.audio@2.0-service \
- android.hardware.soundtrigger@2.3-impl \
#
# BiometricsFace HAL
diff --git a/tests/hal/hal_implementation_test.cpp b/tests/hal/hal_implementation_test.cpp
index 8c2ae50..f16d8a6 100644
--- a/tests/hal/hal_implementation_test.cpp
+++ b/tests/hal/hal_implementation_test.cpp
@@ -74,6 +74,7 @@
"android.hardware.radio.config@1.2",
"android.hardware.radio.deprecated@1.0",
"android.hardware.renderscript@1.0",
+ "android.hardware.soundtrigger@2.3",
"android.hardware.secure_element@1.2",
"android.hardware.sensors@1.0",
"android.hardware.tetheroffload.config@1.0",
