summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2024-02-20 16:53:56 +0000
committerEric Laurent <elaurent@google.com>2024-02-21 13:54:32 +0000
commit1103b4df070ceb1f2dd75b77f313441ab44811e7 (patch)
tree9aa37f7e4c168d8c0ae3fb31291fcb688f7ddc6e
parentd971c58c8c0b373bfe8899bd98424ed821b7c984 (diff)
downloadav-1103b4df070ceb1f2dd75b77f313441ab44811e7.tar.gz
audio: add feature flag for new headset profile and SCO audio management
Add flag sco_managed_by_audio to enable the new mechanism of headset profile management and SCO audio link activation in the audio framework. Bug: 265057196 Test: make Change-Id: I4c3a28990985987dfd2d85251f335867bb1c8c75 Merged-In: I4aa9988ed0c05a2e441f02c788f30acd528e04fd
-rw-r--r--media/audio/aconfig/Android.bp37
-rw-r--r--media/audio/aconfig/audio_framework.aconfig15
2 files changed, 52 insertions, 0 deletions
diff --git a/media/audio/aconfig/Android.bp b/media/audio/aconfig/Android.bp
new file mode 100644
index 0000000000..82f3d85d24
--- /dev/null
+++ b/media/audio/aconfig/Android.bp
@@ -0,0 +1,37 @@
+// media_audio namespace flags
+
+cc_defaults {
+ name: "audio-aconfig-cc-defaults",
+ host_supported: true,
+}
+
+// Framework available flags to follow
+// Care must be taken to avoid namespace conflicts.
+// These flags are accessible outside of the platform! Limit usage to @FlaggedApi wherever possible
+
+aconfig_declarations {
+ name: "android.media.audio-aconfig",
+ package: "android.media.audio",
+ container: "system",
+ srcs: ["audio_framework.aconfig"],
+ visibility: ["//frameworks/base/api"],
+}
+
+java_aconfig_library {
+ name: "android.media.audio-aconfig-java",
+ aconfig_declarations: "android.media.audio-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+ name: "android.media.audio-aconfig-cc",
+ aconfig_declarations: "android.media.audio-aconfig",
+ defaults: ["audio-aconfig-cc-defaults"],
+}
+
+aconfig_declarations_group {
+ name: "audio-framework-aconfig",
+ java_aconfig_libraries: [
+ "android.media.audio-aconfig-java",
+ ],
+}
diff --git a/media/audio/aconfig/audio_framework.aconfig b/media/audio/aconfig/audio_framework.aconfig
new file mode 100644
index 0000000000..2cafe58a72
--- /dev/null
+++ b/media/audio/aconfig/audio_framework.aconfig
@@ -0,0 +1,15 @@
+# Top level framework (android.media) flags
+# Only add flags here which must be included in framework.jar
+#
+# Please add flags in alphabetical order.
+
+package: "android.media.audio"
+
+flag {
+ name: "sco_managed_by_audio"
+ namespace: "media_audio"
+ description: "\
+Enable new implementation of headset profile device connection and\
+SCO audio activation."
+ bug: "265057196"
+}