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

Commit a6544e3b authored by Nadav Bar's avatar Nadav Bar Committed by Android (Google) Code Review
Browse files

Merge "Check if calling uid is system uid for setAllowedPolicyCapture." into qt-qpr1-dev

parents 06b75223 56d41830

media/libaudioclient/IAudioPolicyService.cpp

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

        case LIST_AUDIO_VOLUME_GROUPS:

        case GET_VOLUME_GROUP_FOR_ATTRIBUTES:

        case SET_RTT_ENABLED: {

        case SET_RTT_ENABLED:

        case SET_ALLOWED_CAPTURE_POLICY: {

            if (!isServiceUid(IPCThreadState::self()->getCallingUid())) {

                ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",

                      __func__, code, IPCThreadState::self()->getCallingPid(),

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+0 −5
Original line number Diff line number Diff line
@@ -976,11 +976,6 @@ status_t AudioPolicyService::setAllowedCapturePolicy(uid_t uid, audio_flags_mask 
        ALOGV("%s() mAudioPolicyManager == NULL", __func__);

        return NO_INIT;

    }

    uint_t callingUid = IPCThreadState::self()->getCallingUid();

    if (uid != callingUid) {

        ALOGD("%s() uid invalid %d != %d", __func__, uid, callingUid);

        return PERMISSION_DENIED;

    }

    return mAudioPolicyManager->setAllowedCapturePolicy(uid, capturePolicy);

}