Merge cherrypicks of ['googleplex-android-review.googlesource.com/26574828'] into 24Q2-release.
Change-Id: Id603fd2f5fd206d591ba315529582cb1fb6541dc
diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk
index 31469ba..2e0f627 100644
--- a/audio/tangorpro/audio-tables.mk
+++ b/audio/tangorpro/audio-tables.mk
@@ -33,7 +33,6 @@
device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
- device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_proxy_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_proxy_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
# AudioEffectHAL Configuration
diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml
index 15c529b..7378357 100644
--- a/audio/tangorpro/config/audio_policy_configuration.xml
+++ b/audio/tangorpro/config/audio_policy_configuration.xml
@@ -255,8 +255,6 @@
</module>
<!-- Remote Submix Audio HAL -->
<xi:include href="r_submix_audio_policy_configuration.xml"/>
- <!-- Audio Proxy Audio HAL -->
- <xi:include href="audio_proxy_policy_configuration.xml"/>
</modules>
<!-- End of Modules section -->
<!-- Volume section -->
diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
index b373ecc..56dce30 100644
--- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -234,8 +234,6 @@
</module>
<!-- Remote Submix Audio HAL -->
<xi:include href="r_submix_audio_policy_configuration.xml"/>
- <!-- Audio Proxy Audio HAL -->
- <xi:include href="audio_proxy_policy_configuration.xml"/>
</modules>
<!-- End of Modules section -->
<!-- Volume section -->
diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index b321568..47b581c 100644
--- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -226,8 +226,6 @@
</module>
<!-- Remote Submix Audio HAL -->
<xi:include href="r_submix_audio_policy_configuration.xml"/>
- <!-- Audio Proxy Audio HAL -->
- <xi:include href="audio_proxy_policy_configuration.xml"/>
</modules>
<!-- End of Modules section -->
<!-- Volume section -->
diff --git a/audio/tangorpro/config/audio_proxy_policy_configuration.xml b/audio/tangorpro/config/audio_proxy_policy_configuration.xml
deleted file mode 100644
index 88de36a..0000000
--- a/audio/tangorpro/config/audio_proxy_policy_configuration.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module name="mediashell" halVersion="2.0">
- <attachedDevices>
- <item>MediaShell Direct Audio Device</item>
- <item>MediaShell Mixer Audio Device</item>
- </attachedDevices>
-
- <mixPorts>
- <mixPort name="direct_mix_port" role="source"
- flags="AUDIO_OUTPUT_FLAG_DIRECT" maxOpenCount="0">
- <profile name="" format="AUDIO_FORMAT_PCM_8_BIT"
- samplingRates="16000 44100 48000"
- channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="16000 44100 48000"
- channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
- <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
- samplingRates="16000 44100 48000"
- channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
- </mixPort>
-
- <mixPort name="mixer_mix_port" role="source">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="48000"
- channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
- </mixPort>
- </mixPorts>
-
- <devicePorts>
- <devicePort tagName="MediaShell Direct Audio Device"
- type="AUDIO_DEVICE_OUT_BUS"
- role="sink" address="MEDIASHELL_AUDIO_DEVICE_ADDR">
- </devicePort>
-
- <devicePort tagName="MediaShell Mixer Audio Device"
- type="AUDIO_DEVICE_OUT_BUS"
- role="sink" address="MEDIASHELL_MIXER_DEVICE_ADDR">
- </devicePort>
- </devicePorts>
-
- <routes>
- <route type="mix" sink="MediaShell Direct Audio Device"
- sources="direct_mix_port"/>
-
- <route type="mix" sink="MediaShell Mixer Audio Device"
- sources="mixer_mix_port"/>
- </routes>
-</module>
\ No newline at end of file
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index b5137f9..1584fba 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -299,13 +299,6 @@
PRODUCT_SOONG_NAMESPACES += device/google/tangorpro/audio/tangorpro/prebuilt/libspeechenhancer
-# AudioProxy
-PRODUCT_PACKAGES += \
- libaudio_proxy.google \
- device.google.atv.audio_proxy@7.1-service
-
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml
-
#Audio
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.speech_enhancement.enable=1
@@ -314,9 +307,6 @@
libspeechenhancer \
audio_speech_enhancer_aoc
-PRODUCT_COPY_FILES += \
- device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt
-
# SKU specific RROs
PRODUCT_PACKAGES += \
SettingsOverlayGTU8P
diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml
deleted file mode 100644
index 86fe457..0000000
--- a/device_framework_matrix_product_tangorpro.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<compatibility-matrix version="1.0" type="framework" level="7">
- <!-- AudioProxy -->
- <hal format="aidl" optional="true">
- <name>device.google.atv.audio_proxy</name>
- <version>3</version>
- <interface>
- <name>IAudioProxy</name>
- <instance>mediashell</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.audio</name>
- <transport>hwbinder</transport>
- <version>7.1</version>
- <interface>
- <name>IDevicesFactory</name>
- <instance>mediashell</instance>
- </interface>
- </hal>
-</compatibility-matrix>
-
diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt
deleted file mode 100644
index 2a2d2fe..0000000
--- a/public.libraries-google-tangorpro.txt
+++ /dev/null
@@ -1 +0,0 @@
-libaudio_proxy.google.so
