commit 1e02575668561b0cc71baa8fb883caf4306aa3ef
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 07 14:56:26 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 07 14:56:26 2024 +0000
tree d9a818524474a24d3d9d18715c3f006a3041f946
parent ef659d88d10274438a65aeb9e30b081b927f7cee
parent 7f1823bda8d5d43fe57cdf8ee4ff72fc003d6719

Merge "Remove SCO flag from valid attributes check" into main

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index a4e155b..7667571 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -8732,8 +8732,12 @@
 
 bool AudioPolicyManager::isValidAttributes(const audio_attributes_t *paa)
 {
+    if ((paa->flags & AUDIO_FLAG_SCO) != 0) {
+        ALOGW("%s: deprecated use of AUDIO_FLAG_SCO in attributes flags %d", __func__, paa->flags);
+    }
+
     // has flags that map to a stream type?
-    if ((paa->flags & (AUDIO_FLAG_AUDIBILITY_ENFORCED | AUDIO_FLAG_SCO | AUDIO_FLAG_BEACON)) != 0) {
+    if ((paa->flags & (AUDIO_FLAG_AUDIBILITY_ENFORCED | AUDIO_FLAG_BEACON)) != 0) {
         return true;
     }