Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ed7557d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audiopolicy: allow to identify internal strategies by attributes" am:... 

Merge "audiopolicy: allow to identify internal strategies by attributes" am: b58193e3 am: 1adfc0be

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2601285



Change-Id: Ib24551be8f959f80301810d2f22d16910da9abed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8385fb5f 1adfc0be

services/audiopolicy/engine/common/src/EngineDefaultConfig.h

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#pragma once



#include <EngineConfig.h>



#include <system/audio.h>



namespace android {
@@ -142,7 +144,7 @@ const engineConfig::ProductStrategies gOrderedSystemStrategies = { 
     {

         {AUDIO_STREAM_REROUTING, "AUDIO_STREAM_REROUTING",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_VIRTUAL_SOURCE, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_NONE, ""}}

            AUDIO_FLAG_NONE, AUDIO_TAG_APM_RESERVED_INTERNAL}}

         }

     },

    },
@@ -150,7 +152,7 @@ const engineConfig::ProductStrategies gOrderedSystemStrategies = { 
     {

         {AUDIO_STREAM_PATCH, "AUDIO_STREAM_PATCH",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_UNKNOWN, AUDIO_SOURCE_DEFAULT,

            AUDIO_FLAG_NONE, ""}}

            AUDIO_FLAG_NONE, AUDIO_TAG_APM_RESERVED_INTERNAL}}

         }

     },

    }

services/audiopolicy/engine/config/include/EngineConfig.h

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ 
struct _xmlNode;

struct _xmlDoc;



/**

 * AudioAttributes custom tag to identify internal strategies, whose volumes are exclusively

 * controlled by AudioPolicyManager

 */

#define AUDIO_TAG_APM_RESERVED_INTERNAL "reserved_internal_strategy"



namespace android {

namespace engineConfig {