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

Commit 39a9a80d authored by Shunkai Yao's avatar Shunkai Yao Committed by Android (Google) Code Review
Browse files

Merge "Return non-zero channel mask for orphan effects" into main

parents ef0ab2fd fe63c333

services/audioflinger/Effects.cpp

+4 −4
Original line number Diff line number Diff line
@@ -3146,11 +3146,11 @@ NO_THREAD_SAFETY_ANALYSIS 
{

    const sp<IAfThreadBase> t = thread().promote();

    if (t == nullptr) {

        return AUDIO_CHANNEL_NONE;

        return AUDIO_CHANNEL_OUT_STEREO;

    }

    sp<IAfEffectChain> c = chain().promote();

    if (c == nullptr) {

        return AUDIO_CHANNEL_NONE;

        return AUDIO_CHANNEL_OUT_STEREO;

    }



    if (mThreadType == IAfThreadBase::SPATIALIZER) {
@@ -3185,11 +3185,11 @@ NO_THREAD_SAFETY_ANALYSIS 
{

    const sp<IAfThreadBase> t = thread().promote();

    if (t == nullptr) {

        return AUDIO_CHANNEL_NONE;

        return AUDIO_CHANNEL_OUT_STEREO;

    }

    sp<IAfEffectChain> c = chain().promote();

    if (c == nullptr) {

        return AUDIO_CHANNEL_NONE;

        return AUDIO_CHANNEL_OUT_STEREO;

    }



    if (mThreadType == IAfThreadBase::SPATIALIZER) {