Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev

core/jni/android_media_AudioRecord.cpp

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

@@ -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;
 }