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

Commit 638fcaa3 authored by jiabin's avatar jiabin Committed by Jiabin Huang
Browse files

Allow to use audio attributes tags if clients can use dynamic policy. 

The audio attributes tags will also be used by dynamic policy. For
clients that can use dynamic policy will should also be allowed to use
audio attributes tags.

Test: atest VirtualAudioPermissionTest
Bug: 382113460
Flag: EXEMPT bugfix
Change-Id: I29175931bac56b0cbd25721b3853f7c6faf7d309
parent 917b6ba9

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+12 −3
Original line number Diff line number Diff line
@@ -445,9 +445,18 @@ Status AudioPolicyService::getOutputForAttr(const media::audio::common::AudioAtt 
    }



    if (strlen(attr.tags) != 0) {

        if (!(audioserver_permissions() ?

              CHECK_PERM(MODIFY_AUDIO_SETTINGS_PRIVILEGED, attributionSource.uid)

              : modifyAudioSettingsPrivilegedAllowed(attributionSource))) {

        const bool audioAttributesTagsAllowed = audioserver_permissions() ? (

                CHECK_PERM(MODIFY_AUDIO_SETTINGS_PRIVILEGED, attributionSource.uid) ||

                CHECK_PERM(MODIFY_AUDIO_ROUTING, attributionSource.uid) ||

                CHECK_PERM(CALL_AUDIO_INTERCEPTION, attributionSource.uid) ||

                CHECK_PERM(CAPTURE_MEDIA_OUTPUT, attributionSource.uid) ||

                CHECK_PERM(CAPTURE_VOICE_COMMUNICATION_OUTPUT, attributionSource.uid))

                : (modifyAudioSettingsPrivilegedAllowed(attributionSource) ||

                   modifyAudioRoutingAllowed() ||

                   callAudioInterceptionAllowed(attributionSource) ||

                   captureMediaOutputAllowed(attributionSource) ||

                   captureVoiceCommunicationOutputAllowed(attributionSource));

        if (!audioAttributesTagsAllowed) {

            ALOGE("%s: permission denied: audio attributes tags not allowed for uid %d pid %d",

                  __func__, attributionSource.uid, attributionSource.pid);

            return binderStatusFromStatusT(PERMISSION_DENIED);