| commit | abbeb4368789d52d574048bf66c01f6de85639a9 | [log] [tgz] |
|---|---|---|
| author | Henry Fang <quxiangfang@google.com> | Thu Mar 16 22:14:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 16 22:14:53 2023 +0000 |
| tree | 27c5d24bbc39217b2413e35307823b76f52e4bff | |
| parent | acb4e743b136198a8518e7273045b0e89944f531 [diff] | |
| parent | 0756491f6f880267a6a119ffaa7ec7c97bac3d90 [diff] |
Merge "audio: prevent invalid fallback when in tuner passthrough" am: 7c83e3e1a4 am: f937c3b7ac am: 0756491f6f Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2493577 Change-Id: I88214836216535b51ca8705b6d1d8ce4b41d58e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index cf6eeb3..22e4686 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1582,6 +1582,10 @@ if ((*flags & (AUDIO_OUTPUT_FLAG_HW_AV_SYNC | AUDIO_OUTPUT_FLAG_MMAP_NOIRQ)) != 0) { return AUDIO_IO_HANDLE_NONE; } + // A request for Tuner cannot fallback to a mixed output + if ((directConfig.offload_info.content_id || directConfig.offload_info.sync_id)) { + return AUDIO_IO_HANDLE_NONE; + } // ignoring channel mask due to downmix capability in mixer