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

Commit b264239b authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

AudioFlinger: limit ability to create a Spatializer effect am: f690c468 am: c74eba8e 

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

Change-Id: Ia70e8a9257ad6733b70a2f870af4ad31c1ec27a6
parents 932cb962 c74eba8e

services/audioflinger/AudioFlinger.cpp

+10 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include <system/audio_effects/effect_ns.h>

#include <system/audio_effects/effect_aec.h>

#include <system/audio_effects/effect_hapticgenerator.h>

#include <system/audio_effects/effect_spatializer.h>



#include <audio_utils/primitives.h>
@@ -3790,6 +3791,15 @@ status_t AudioFlinger::createEffect(const media::CreateEffectRequest& request, 
            goto Exit;

        }



        // Only audio policy service can create a spatializer effect

        if ((memcmp(&descOut.type, FX_IID_SPATIALIZER, sizeof(effect_uuid_t)) == 0) &&

            (callingUid != AID_AUDIOSERVER || currentPid != getpid())) {

            ALOGW("%s: attempt to create a spatializer effect from uid/pid %d/%d",

                    __func__, callingUid, currentPid);

            lStatus = PERMISSION_DENIED;

            goto Exit;

        }



        if (io == AUDIO_IO_HANDLE_NONE && sessionId == AUDIO_SESSION_OUTPUT_MIX) {

            // if the output returned by getOutputForEffect() is removed before we lock the

            // mutex below, the call to checkPlaybackThread_l(io) below will detect it

services/audioflinger/Threads.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,13 @@ status_t AudioFlinger::PlaybackThread::checkEffectCompatibility_l( 
        return BAD_VALUE;

    }



    if (memcmp(&desc->type, FX_IID_SPATIALIZER, sizeof(effect_uuid_t)) == 0

            && mType != SPATIALIZER) {

        ALOGW("%s: attempt to create a spatializer effect on a thread of type %d",

                __func__, mType);

        return BAD_VALUE;

    }



    switch (mType) {

    case MIXER: {

#ifndef MULTICHANNEL_EFFECT_CHAIN