commit 671c48570754cf3f70cdbd3e5fd07bd8ea9c3b73
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Mar 25 21:34:21 2022 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Mar 25 21:34:21 2022 +0000
tree 80608bc7196acc480b8c61cc12e252d80bee2554
parent 8916c8fe2be332c27b187c2933b84524cdc62df8
parent bf8f69ff9bebdac0504095b1bee416da6235dc59

[automerge] audio policy: fix offload when spatial audio is enabled. 2p: bf8f69ff9b

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

Bug: 225119469
Change-Id: I73054552e7d95fcb7ddb345c22870af385140fdf

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 7e9ccfe..04798b4 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3040,9 +3040,10 @@
             }
         }
     }
-    return mEffects.registerEffect(desc, io, session, id,
-                                   (strategy == streamToStrategy(AUDIO_STREAM_MUSIC) ||
-                                   strategy == PRODUCT_STRATEGY_NONE));
+    bool isMusicEffect = (session != AUDIO_SESSION_OUTPUT_STAGE)
+                            && ((strategy == streamToStrategy(AUDIO_STREAM_MUSIC)
+                                    || strategy == PRODUCT_STRATEGY_NONE));
+    return mEffects.registerEffect(desc, io, session, id, isMusicEffect);
 }
 
 status_t AudioPolicyManager::unregisterEffect(int id)