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

Commit fb4e361a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio policy: re enable setForceUse for system apps." into pi-dev

parents 725128d7 e17378d1

media/libaudioclient/IAudioPolicyService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -876,7 +876,8 @@ status_t BnAudioPolicyService::onTransact( 
        case SET_DEVICE_CONNECTION_STATE:

        case HANDLE_DEVICE_CONFIG_CHANGE:

        case SET_PHONE_STATE:

        case SET_FORCE_USE:

//FIXME: Allow SET_FORCE_USE calls from system apps until a better use case routing API is available

//      case SET_FORCE_USE:

        case INIT_STREAM_VOLUME:

        case SET_STREAM_VOLUME:

        case REGISTER_POLICY_MIXES:

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+3 −1
Original line number Diff line number Diff line
@@ -121,9 +121,11 @@ status_t AudioPolicyService::setForceUse(audio_policy_force_use_t usage, 
    if (mAudioPolicyManager == NULL) {

        return NO_INIT;

    }

    if (!settingsAllowed()) {



    if (!modifyAudioRoutingAllowed()) {

        return PERMISSION_DENIED;

    }



    if (usage < 0 || usage >= AUDIO_POLICY_FORCE_USE_CNT) {

        return BAD_VALUE;

    }