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

Commit a053abe0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix cts fail AudioTrackTest#testPlaybackHeadPositionIncrease" am: ac89ed72 

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



Change-Id: I24b685a29563fd0d0ded70cf479e651fe0cf789f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 866ca599 ac89ed72

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,12 @@ audio_io_handle_t AudioPolicyManager::getOutput(audio_stream_type_t stream) 
    // and AudioSystem::getOutputSamplingRate().



    SortedVector<audio_io_handle_t> outputs = getOutputsForDevices(devices, mOutputs);

    const audio_io_handle_t output = selectOutput(outputs);

    audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE;

    if (stream == AUDIO_STREAM_MUSIC &&

        property_get_bool("audio.deep_buffer.media", false /* default_value */)) {

        flags = AUDIO_OUTPUT_FLAG_DEEP_BUFFER;

    }

    const audio_io_handle_t output = selectOutput(outputs, flags);



    ALOGV("getOutput() stream %d selected devices %s, output %d", stream,

          devices.toString().c_str(), output);