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

Commit da9f4d75 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8656240 from 9f1b1863 to tm-release 

Change-Id: I5a7a050b4f5011804faa14f1ae7d500ee878e26a
parents 8b0a717a 9f1b1863

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media",

  "version": 330090000,

  "version": 339990000,

  "requireNativeLibs": [

    "libandroid.so",

    "libbinder_ndk.so",

apex/manifest_codec.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media.swcodec",

  "version": 330090000,

  "version": 339990000,

  "requireNativeLibs": [

    ":sphal"

  ]

services/audioflinger/AudioFlinger.cpp

+13 −6
Original line number Diff line number Diff line
@@ -3889,17 +3889,24 @@ status_t AudioFlinger::createEffect(const media::CreateEffectRequest& request, 
            goto Exit;

        }

    } else if (sessionId == AUDIO_SESSION_OUTPUT_STAGE) {

        if (!isAudioServerUid(callingUid)) {

            ALOGE("%s: only APM can create using AUDIO_SESSION_OUTPUT_STAGE", __func__);

            lStatus = PERMISSION_DENIED;

            goto Exit;

        }



        if (io == AUDIO_IO_HANDLE_NONE) {

            ALOGE("%s: APM must specify output when using AUDIO_SESSION_OUTPUT_STAGE", __func__);

            lStatus = BAD_VALUE;

            goto Exit;

        }

        PlaybackThread *thread = checkPlaybackThread_l(io);

        if (thread == nullptr) {

            ALOGE("%s: invalid output %d specified for AUDIO_SESSION_OUTPUT_STAGE", __func__, io);

            lStatus = BAD_VALUE;

            goto Exit;

        }

        if (!modifyDefaultAudioEffectsAllowed(adjAttributionSource)

                && !isAudioServerUid(callingUid)) {

            ALOGE("%s: effect on AUDIO_SESSION_OUTPUT_STAGE not granted for uid %d",

                    __func__, callingUid);

            lStatus = PERMISSION_DENIED;

            goto Exit;

        }

    } else if (sessionId == AUDIO_SESSION_DEVICE) {

        if (!modifyDefaultAudioEffectsAllowed(adjAttributionSource)) {

            ALOGE("%s: device effect permission denied for uid %d", __func__, callingUid);