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

Commit f01d1c0c authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 5c2f2039: Merge "Don\'t ignore return value of setAuxEffectSendLevel()" 

* commit '5c2f2039':
  Don't ignore return value of setAuxEffectSendLevel()
parents 8640be25 5c2f2039

core/jni/android_media_AudioTrack.cpp

+9 −4
Original line number Diff line number Diff line
@@ -887,17 +887,22 @@ static jint android_media_AudioTrack_get_min_buff_size(JNIEnv *env, jobject thi 
}



// ----------------------------------------------------------------------------

static void

static jint

android_media_AudioTrack_setAuxEffectSendLevel(JNIEnv *env, jobject thiz, jfloat level )

{

    sp<AudioTrack> lpTrack = getAudioTrack(env, thiz);

    if (lpTrack == NULL ) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve AudioTrack pointer for setAuxEffectSendLevel()");

        return;

        return -1;

    }



    lpTrack->setAuxEffectSendLevel(level);

    status_t status = lpTrack->setAuxEffectSendLevel(level);

    if (status != NO_ERROR) {

        ALOGE("AudioTrack::setAuxEffectSendLevel() for level %g failed with status %d",

                level, status);

    }

    return (jint) status;

}



// ----------------------------------------------------------------------------
@@ -953,7 +958,7 @@ static JNINativeMethod gMethods[] = { 
    {"native_get_min_buff_size",

                             "(III)I",   (void *)android_media_AudioTrack_get_min_buff_size},

    {"native_setAuxEffectSendLevel",

                             "(F)V",     (void *)android_media_AudioTrack_setAuxEffectSendLevel},

                             "(F)I",     (void *)android_media_AudioTrack_setAuxEffectSendLevel},

    {"native_attachAuxEffect",

                             "(I)I",     (void *)android_media_AudioTrack_attachAuxEffect},

};

media/java/android/media/AudioTrack.java

+4 −4
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ public class AudioTrack 
     *

     * @param level send level scalar

     * @return error code or success, see {@link #SUCCESS},

     *    {@link #ERROR_INVALID_OPERATION}

     *    {@link #ERROR_INVALID_OPERATION}, {@link #ERROR}

     */

    public int setAuxEffectSendLevel(float level) {

        if (isRestricted()) {
@@ -1337,8 +1337,8 @@ public class AudioTrack 
        if (level > getMaxVolume()) {

            level = getMaxVolume();

        }

        native_setAuxEffectSendLevel(level);

        return SUCCESS;

        int err = native_setAuxEffectSendLevel(level);

        return err == 0 ? SUCCESS : ERROR;

    }



    //---------------------------------------------------------
@@ -1508,7 +1508,7 @@ public class AudioTrack 
            int sampleRateInHz, int channelConfig, int audioFormat);



    private native final int native_attachAuxEffect(int effectId);

    private native final void native_setAuxEffectSendLevel(float level);

    private native final int native_setAuxEffectSendLevel(float level);



    //---------------------------------------------------------

    // Utility methods