commit 656d3e6dc43bcd107b3ab236a35e6e6fd2b8bdd9
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Mar 25 23:34:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 25 23:34:16 2022 +0000
tree b4334afaba2d8c465e4b1c42699b46727a39b056
parent bcc352567b1403de19d364183f847c3d569fb9f9
parent 671c48570754cf3f70cdbd3e5fd07bd8ea9c3b73

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

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

Change-Id: I4ed82d9460d1e61b3d71dc5273563ec44099b2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index e45de32..5720551 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3192,9 +3192,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)