drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Request permission for global audio effects." into gingerbread

Browse Source
This commit is contained in:
Eric Laurent
2010-09-22 16:00:59 -07:00
committed by Android (Google) Code Review
parent 127146ee1c 14beea487c
commit 08959c6396
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/audioflinger/AudioFlinger.cpp
View File

@ -4656,13 +4656,25 @@ sp<IEffect> AudioFlinger::createEffect(pid_t pid,
{ {
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
// check recording permission for visualizer // check audio settings permission for global effects
if (memcmp(&pDesc->type, SL_IID_VISUALIZATION, sizeof(effect_uuid_t)) == 0 || if (sessionId == AudioSystem::SESSION_OUTPUT_MIX && !settingsAllowed()) {
memcmp(&pDesc->uuid, &VISUALIZATION_UUID_, sizeof(effect_uuid_t)) == 0) {
if (!recordingAllowed()) {
lStatus = PERMISSION_DENIED; lStatus = PERMISSION_DENIED;
goto Exit; goto Exit;
} }
// Session AudioSystem::SESSION_OUTPUT_STAGE is reserved for output stage effects
// that can only be created by audio policy manager (running in same process)
if (sessionId == AudioSystem::SESSION_OUTPUT_STAGE && getpid() != pid) {
lStatus = PERMISSION_DENIED;
goto Exit;
}
// check recording permission for visualizer
if ((memcmp(&pDesc->type, SL_IID_VISUALIZATION, sizeof(effect_uuid_t)) == 0 ||
memcmp(&pDesc->uuid, &VISUALIZATION_UUID_, sizeof(effect_uuid_t)) == 0) &&
!recordingAllowed()) {
lStatus = PERMISSION_DENIED;
goto Exit;
} }
if (!EffectIsNullUuid(&pDesc->uuid)) { if (!EffectIsNullUuid(&pDesc->uuid)) {
@ -4727,14 +4739,6 @@ sp<IEffect> AudioFlinger::createEffect(pid_t pid,
goto Exit; goto Exit;
} }
// Session AudioSystem::SESSION_OUTPUT_STAGE is reserved for output stage effects
// that can only be created by audio policy manager (running in same process)
if (sessionId == AudioSystem::SESSION_OUTPUT_STAGE &&
getpid() != pid) {
lStatus = INVALID_OPERATION;
goto Exit;
}
// return effect descriptor // return effect descriptor
memcpy(pDesc, &desc, sizeof(effect_descriptor_t)); memcpy(pDesc, &desc, sizeof(effect_descriptor_t));