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

Commit bd3f8b71 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

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

Merge commit 'e7b790f1' into gingerbread-plus-aosp

* commit 'e7b790f1':
  Fix swap of sessionId and output in audio effect API.
parents a60337ce e7b790f1

media/jni/audioeffect/android_media_AudioEffect.cpp

+2 −2
Original line number Diff line number Diff line
@@ -323,8 +323,8 @@ android_media_AudioEffect_native_setup(JNIEnv *env, jobject thiz, jobject weak_t 
                                    priority,

                                    effectCallback,

                                    &lpJniStorage->mCallbackData,

                                    0,

                                    sessionId);

                                    sessionId,

                                    0);

    if (lpAudioEffect == NULL) {

        LOGE("Error creating AudioEffect");

        goto setup_failure;

media/libmedia/AudioEffect.cpp

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ AudioEffect::AudioEffect(const effect_uuid_t *type, 
                )

    : 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,
@@ -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,