Evolution-X-Tensor/device_google_tangorpro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future

Browse source 
Bug: 343100748
Merged-In: I9ce27a764a09b8d878d4d14ed956205000355610
Change-Id: Ie052fcfb128711cdeed0083e52b40c8c53f4f805
This commit is contained in:
Xin Li 2024-06-05 14:12:12 -07:00
commit 16db441dbe
8 changed files with 0 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

1
audio/tangorpro/audio-tables.mk
View file

@ -33,7 +33,6 @@ PRODUCT_COPY_FILES += \
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

2
audio/tangorpro/config/audio_policy_configuration.xml
View file

@ -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 -->

2
audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -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 -->

2
audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -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 -->

48
audio/tangorpro/config/audio_proxy_policy_configuration.xml
View file

@ -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>

10
device-tangorpro.mk
View file

@ -299,13 +299,6 @@ PRODUCT_PACKAGES += \
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 @@ PRODUCT_PACKAGES += \
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

21
device_framework_matrix_product_tangorpro.xml
View file

@ -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>

1
public.libraries-google-tangorpro.txt
View file

@ -1 +0,0 @@
libaudio_proxy.google.so