| commit | 0756491f6f880267a6a119ffaa7ec7c97bac3d90 | [log] [tgz] |
|---|---|---|
| author | Henry Fang <quxiangfang@google.com> | Thu Mar 16 21:37:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 16 21:37:31 2023 +0000 |
| tree | 9e1c387fdcb078c3a010a4a25bd4abc59032fd8a | |
| parent | 5945c909d49df71270a119eae586d6428ea2dede [diff] | |
| parent | f937c3b7ac80ab7ccc5f54c49a46d3bee568ff3b [diff] |
Merge "audio: prevent invalid fallback when in tuner passthrough" am: 7c83e3e1a4 am: f937c3b7ac Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2493577 Change-Id: I4be7a7b018409eea7bcb4468658e1cda8df3db9f 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 c32b965..24c003e 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1531,6 +1531,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