From 4b6dc11462996df5987ac339bf2fb750f500a067 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 12 Sep 2020 12:32:50 +0200 Subject: [PATCH 13/14] [audiopolicy] No longer make re-assigning legacy audio groups fatal. Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined by framework too Change-Id: I794fe22d63a8af705be4f5f09b9879ecaab3eae5 --- services/audiopolicy/engine/common/src/EngineBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/audiopolicy/engine/common/src/EngineBase.cpp b/services/audiopolicy/engine/common/src/EngineBase.cpp index 1bc7fe3dcc..fe18d0d794 100644 --- a/services/audiopolicy/engine/common/src/EngineBase.cpp +++ b/services/audiopolicy/engine/common/src/EngineBase.cpp @@ -206,9 +206,9 @@ engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig() } if (group.stream != AUDIO_STREAM_DEFAULT) { // A legacy stream can be assigned once to a volume group - LOG_ALWAYS_FATAL_IF(checkStreamForGroups(group.stream, mVolumeGroups), - "stream %s already assigned to a volume group, " - "review the configuration", toString(group.stream).c_str()); + if(checkStreamForGroups(group.stream, mVolumeGroups)) { + ALOGE("stream %s already assigned to a volume group, review the configuration", toString(group.stream).c_str()); + } volumeGroup->addSupportedStream(group.stream); } addSupportedAttributesToGroup(group, volumeGroup, strategy); -- 2.17.1