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

Commit 0ff8de1b authored by Paul McLean's avatar Paul McLean Committed by Android Git Automerger
Browse files

am 9804eb10: am 65522bd5: am d6c3404f: Merge "Test for non-null AudioTrack()... 

am 9804eb10: am 65522bd5: am d6c3404f: Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev

* commit '9804eb10':
  Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().
parents 87d84cc4 9804eb10

core/jni/android_media_AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static jboolean android_media_AudioRecord_setInputDevice( 


    sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz);

    if (lpRecorder == 0) {

        return 0;

        return false;

    }

    return lpRecorder->setInputDevice(device_id) == NO_ERROR;

}

core/jni/android_media_AudioTrack.cpp

+3 −0
Original line number Diff line number Diff line
@@ -998,6 +998,9 @@ static jboolean android_media_AudioTrack_setOutputDevice( 
                JNIEnv *env,  jobject thiz, jint device_id) {



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

    if (lpTrack == 0) {

        return false;

    }

    return lpTrack->setOutputDevice(device_id) == NO_ERROR;

}