Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0756491f authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "audio: prevent invalid fallback when in tuner passthrough" am: 7c83e3e1 am: f937c3b7 

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



Change-Id: I4be7a7b018409eea7bcb4468658e1cda8df3db9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5945c909 f937c3b7

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1531,6 +1531,10 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevices( 
    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