commit 06fc3bce7f7c6d26b9d40d80bee348859d9b7da5
author Francois Gaffie <francois.gaffie@renault.com> Fri Aug 28 13:58:36 2020 +0200
committer Mikhail Naganov <mnaganov@google.com> Tue May 23 09:29:03 2023 -0700
tree 045921a85ceebb62d39c084f78368bc7b79c1f60
parent af7c038738a8d7cb9dda37878d8bab8224dc2f8a

audiopolicy: allow to identify internal strategies by attributes

A unique tag is given to internal strategies to prevent confusion with
default strategy, overwritting volume or mute attribute of these internal
strategies.

Test: make
Bug: 179759299
Bug: 249966139
Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Merged-In: I3c08ca3f5445a2da02b25be0e008aa95e46d4289
Change-Id: I61c390787fef88eae24506b60e7cb81680686dc2
(cherry picked from commit 41a82cf13109dc4c91cd6ff7638ebe84a00f57c0)

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

diff --git a/services/audiopolicy/engine/common/src/EngineDefaultConfig.h b/services/audiopolicy/engine/common/src/EngineDefaultConfig.h
index 60b16ac..f132ced 100644
--- a/services/audiopolicy/engine/common/src/EngineDefaultConfig.h
+++ b/services/audiopolicy/engine/common/src/EngineDefaultConfig.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <EngineConfig.h>
+
 #include <system/audio.h>
 
 namespace android {
@@ -142,7 +144,7 @@
      {
          {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 @@
      {
          {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

diff --git a/services/audiopolicy/engine/config/include/EngineConfig.h b/services/audiopolicy/engine/config/include/EngineConfig.h
index d3f701a..119dbd6 100644
--- a/services/audiopolicy/engine/config/include/EngineConfig.h
+++ b/services/audiopolicy/engine/config/include/EngineConfig.h
@@ -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 {