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

Commit c8ab37b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Force DIRECT flag on direct output thread."" into rvc-dev am:... 

Merge "Revert "Force DIRECT flag on direct output thread."" into rvc-dev am: 16c41dd9 am: 22568387 am: 93a4b150

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

Change-Id: I618933032016d2c75b81ddd91e201b92798bd04e
parents dd0e7ca1 93a4b150

services/audioflinger/Threads.cpp

+0 −6
Original line number Diff line number Diff line
@@ -2093,12 +2093,6 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac 
        outputFlags = (audio_output_flags_t)(outputFlags | AUDIO_OUTPUT_FLAG_FAST);

    }



    // Set DIRECT flag if current thread is DirectOutputThread. This can happen when the playback is

    // rerouted to direct output thread by dynamic audio policy.

    if (mType == DIRECT) {

        *flags = (audio_output_flags_t)(*flags | AUDIO_OUTPUT_FLAG_DIRECT);

    }



    // Check if requested flags are compatible with output stream flags

    if ((*flags & outputFlags) != *flags) {

        ALOGW("createTrack_l(): mismatch between requested flags (%08x) and output flags (%08x)",