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

Commit 221a3389 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio polciy: remove FM audio capture permission."

parents db93079d ab300c8c

services/audioflinger/ServiceUtilities.cpp

+0 −7
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ bool captureHotwordAllowed() { 
    return ok;

}



bool captureFmTunerAllowed() {

    static const String16 sCaptureFmTunerAllowed("android.permission.ACCESS_FM_RADIO");

    bool ok = checkCallingPermission(sCaptureFmTunerAllowed);

    if (!ok) ALOGE("android.permission.ACCESS_FM_RADIO");

    return ok;

}



bool settingsAllowed() {

    if (getpid_cached == IPCThreadState::self()->getCallingPid()) return true;

    static const String16 sAudioSettings("android.permission.MODIFY_AUDIO_SETTINGS");

services/audioflinger/ServiceUtilities.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ extern pid_t getpid_cached; 
bool recordingAllowed();

bool captureAudioOutputAllowed();

bool captureHotwordAllowed();

bool captureFmTunerAllowed();

bool settingsAllowed();

bool modifyAudioRoutingAllowed();

bool dumpAllowed();

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+1 −2
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ status_t AudioPolicyService::getInputForAttr(const audio_attributes_t *attr, 
        return BAD_VALUE;

    }



    if (((attr->source == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) ||

        ((attr->source == AUDIO_SOURCE_FM_TUNER) && !captureFmTunerAllowed())) {

    if ((attr->source == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) {

        return BAD_VALUE;

    }

    sp<AudioPolicyEffects>audioPolicyEffects;

services/audiopolicy/service/AudioPolicyInterfaceImplLegacy.cpp

+1 −2
Original line number Diff line number Diff line
@@ -255,8 +255,7 @@ status_t AudioPolicyService::getInputForAttr(const audio_attributes_t *attr, 
        inputSource = AUDIO_SOURCE_MIC;

    }



    if (((inputSource == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) ||

        ((inputSource == AUDIO_SOURCE_FM_TUNER) && !captureFmTunerAllowed())) {

    if ((inputSource == AUDIO_SOURCE_HOTWORD) && !captureHotwordAllowed()) {

        return BAD_VALUE;

    }