From 5b50e7384a4a6ac01fe3e4400a9fb817e57c0d99 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Mon, 22 Mar 2021 13:28:00 +0800 Subject: [PATCH] audio: switch audio HAL to V7 bug: 180878031 Test: atest VtsHalAudioV6_0TargetTest atest VtsHalAudioV7_0TargetTest atest VtsHalAudioEffectV6_0TargetTest atest VtsHalAudioEffectV7_0TargetTest atest VtsHalAudioPolicyV1_0TargetTest manual audio test - playback/record/voice call Signed-off-by: Jasmine Cha Change-Id: I9dbf808307f2de77eb47fbc0eabfa4d03464b36e --- device.mk | 12 +++++++----- manifest-gralloc3.xml | 4 ++-- manifest.xml | 4 ++-- manifest_64-gralloc3.xml | 4 ++-- manifest_64.xml | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/device.mk b/device.mk index 5e96e60f..92c1b42f 100644 --- a/device.mk +++ b/device.mk @@ -984,9 +984,9 @@ PRODUCT_PACKAGES += \ # Audio # Audio HAL Server & Default Implementations PRODUCT_PACKAGES += \ - android.hardware.audio@2.0-service \ - android.hardware.audio@6.0-impl \ - android.hardware.audio.effect@6.0-impl \ + android.hardware.audio.service \ + android.hardware.audio@7.0-impl \ + android.hardware.audio.effect@7.0-impl \ android.hardware.bluetooth.audio@2.1-impl \ android.hardware.soundtrigger@2.3-impl \ vendor.google.whitechapel.audio.audioext@2.0-impl @@ -1020,8 +1020,10 @@ PRODUCT_PACKAGES += \ # AudioHAL Configurations PRODUCT_COPY_FILES += \ - frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration_7_0.xml \ + frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration_7_0.xml \ + frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration_7_0.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index 633a0824..58ff94f7 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -2,7 +2,7 @@ android.hardware.audio hwbinder - 6.0 + 7.0 IDevicesFactory default @@ -11,7 +11,7 @@ android.hardware.audio.effect hwbinder - 6.0 + 7.0 IEffectsFactory default diff --git a/manifest.xml b/manifest.xml index 183304cc..19ffe9e6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -2,7 +2,7 @@ android.hardware.audio hwbinder - 6.0 + 7.0 IDevicesFactory default @@ -11,7 +11,7 @@ android.hardware.audio.effect hwbinder - 6.0 + 7.0 IEffectsFactory default diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml index ff5dbcc3..f98d9c5d 100644 --- a/manifest_64-gralloc3.xml +++ b/manifest_64-gralloc3.xml @@ -2,7 +2,7 @@ android.hardware.audio hwbinder - 6.0 + 7.0 IDevicesFactory default @@ -11,7 +11,7 @@ android.hardware.audio.effect hwbinder - 6.0 + 7.0 IEffectsFactory default diff --git a/manifest_64.xml b/manifest_64.xml index d61a3549..e8ad394b 100644 --- a/manifest_64.xml +++ b/manifest_64.xml @@ -2,7 +2,7 @@ android.hardware.audio hwbinder - 6.0 + 7.0 IDevicesFactory default @@ -11,7 +11,7 @@ android.hardware.audio.effect hwbinder - 6.0 + 7.0 IEffectsFactory default