Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread

Browse Source 
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp

* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
  Fix swap of sessionId and output in audio effect API.
This commit is contained in:
Jean-Michel Trivi
2010-07-09 12:32:21 -07:00
committed by Android Git Automerger
parent a60337ce57 e7b790f1f7
commit bd3f8b7116
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/audioeffect/android_media_AudioEffect.cpp
View File

@@ -323,8 +323,8 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t
priority, priority,
effectCallback, effectCallback,
&lpJniStorage->mCallbackData, &lpJniStorage->mCallbackData,
0, sessionId,
sessionId); 0);
if (lpAudioEffect == NULL) { if (lpAudioEffect == NULL) {
LOGE("Error creating AudioEffect"); LOGE("Error creating AudioEffect");
goto setup_failure; goto setup_failure;

4
media/libmedia/AudioEffect.cpp
View File

@@ -52,7 +52,7 @@ AudioEffect::AudioEffect(const effect_uuid_t *type,
) )
: mStatus(NO_INIT) : mStatus(NO_INIT)
{ {
mStatus = set(type, uuid, priority, cbf, user, output, sessionId); mStatus = set(type, uuid, priority, cbf, user, sessionId, output);
} }
AudioEffect::AudioEffect(const char *typeStr, AudioEffect::AudioEffect(const char *typeStr,
@@ -84,7 +84,7 @@ AudioEffect::AudioEffect(const char *typeStr,
} }
} }
mStatus = set(pType, pUuid, priority, cbf, user, output, sessionId); mStatus = set(pType, pUuid, priority, cbf, user, sessionId, output);
} }
status_t AudioEffect::set(const effect_uuid_t *type, status_t AudioEffect::set(const effect_uuid_t *type,