From 8a52581b0938e34bb91533a5f470b89ed5d1ebbe Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Thu, 4 Feb 2021 19:24:05 +0000 Subject: [PATCH 1/3] audio: Update audioPolicyConfiguration version HAL V7 uses spaces instead of ',' and '|' for delimiting elements in channel masks, sample rates, and flags lists in the Audio Policy Manager configuration XML. The version specified in the APM XML has been updated from '1.0' to '7.0' in order to reflect this. The migration script has been updated to change the version in the XML on update. Bug: 142480271 Test: m Change-Id: I92c206dddee6964fc2019fed80435cb8d69dbfe9 --- audio/7.0/config/api/current.txt | 2 +- audio/7.0/config/audio_policy_configuration.xsd | 2 +- audio/7.0/config/update_audio_policy_config.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index c1940e5ad0..8fb8036ff8 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt @@ -544,7 +544,7 @@ package android.audio.policy.configuration.V7_0 { public enum Version { method @NonNull public String getRawName(); - enum_constant public static final android.audio.policy.configuration.V7_0.Version _1_0; + enum_constant public static final android.audio.policy.configuration.V7_0.Version _7_0; } public class Volume { diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd index 4d224c8f07..40dc6f2c69 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd @@ -20,7 +20,7 @@ - + diff --git a/audio/7.0/config/update_audio_policy_config.sh b/audio/7.0/config/update_audio_policy_config.sh index 051a0df916..159fa35946 100755 --- a/audio/7.0/config/update_audio_policy_config.sh +++ b/audio/7.0/config/update_audio_policy_config.sh @@ -113,6 +113,9 @@ echo "Will update paths to shared included files." echo "Press Ctrl-C to cancel, Enter to continue" read +# Update 'audioPolicyConfiguration version="1.0"' -> 7.0 in the main file +sed -i -r -e 's/(audioPolicyConfiguration version=")1.0/\17.0/' ${SOURCE_CONFIG} + updateFile() { FILE=$1 ATTR=$2 From b4443504f166b2e4a6590f06c2618071d51fb679 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 5 Feb 2021 00:10:40 +0000 Subject: [PATCH 2/3] Default Audio HAL service: add V7, remove V2 Modify the list of supported audio HAL versions in android.hardware.audio.service: add V7, remove V2. Bug: 171260360 Test: m Change-Id: I7ecdac0b9a30e51e2b1b54d7a56dfc9d62649fb4 --- audio/common/all-versions/default/service/service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/common/all-versions/default/service/service.cpp b/audio/common/all-versions/default/service/service.cpp index 710ddcea11..bbc14adc6c 100644 --- a/audio/common/all-versions/default/service/service.cpp +++ b/audio/common/all-versions/default/service/service.cpp @@ -63,17 +63,17 @@ int main(int /* argc */, char* /* argv */ []) { const std::vector mandatoryInterfaces = { { "Audio Core API", + "android.hardware.audio@7.0::IDevicesFactory", "android.hardware.audio@6.0::IDevicesFactory", "android.hardware.audio@5.0::IDevicesFactory", "android.hardware.audio@4.0::IDevicesFactory", - "android.hardware.audio@2.0::IDevicesFactory" }, { "Audio Effect API", + "android.hardware.audio.effect@7.0::IEffectsFactory", "android.hardware.audio.effect@6.0::IEffectsFactory", "android.hardware.audio.effect@5.0::IEffectsFactory", "android.hardware.audio.effect@4.0::IEffectsFactory", - "android.hardware.audio.effect@2.0::IEffectsFactory", } }; From c32b8584e9e38b1cf9f303bd28854348a79c3837 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 5 Feb 2021 01:41:05 +0000 Subject: [PATCH 3/3] audio: Fix SourceMetadata spec in HAL V7 VTS Bug: 142480271 Test: atest VtsHalAudioV7_0TargetTest Change-Id: Idb1130c9b0d32a41f22c49fa1d14ffe8ec2a3f3c --- .../all-versions/vts/functional/AudioPrimaryHidlHalTest.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h index 2b9e336c2d..61e99e8699 100644 --- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h +++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h @@ -928,9 +928,9 @@ class OutputStreamTest : public OpenStreamTest { const SourceMetadata initMetadata = { { { toString(xsd::AudioUsage::AUDIO_USAGE_MEDIA), toString(xsd::AudioContentType::AUDIO_CONTENT_TYPE_MUSIC), - {}, + 1 /* gain */, toString(xsd::AudioChannelMask::AUDIO_CHANNEL_OUT_STEREO), - 1 /* gain */ } }}; + {} } }}; #endif }; TEST_P(OutputStreamTest, OpenOutputStreamTest) {