From cef696e8b464e6479ed352b3b490e41ee677bd91 Mon Sep 17 00:00:00 2001
From: Paul McLean <pmclean@google.com>
Date: Thu, 21 May 2015 08:51:18 -0700
Subject: [PATCH] Test for non-null AudioTrack() object in
 android_media_AudioTrack_setOutputDevice().

Change-Id: Ibf77bb0757720aa25eaaf6e603ab446257430453
---
 core/jni/android_media_AudioRecord.cpp | 2 +-
 core/jni/android_media_AudioTrack.cpp  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index 87b81d5fcad26..3ae700687407f 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/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;
 }
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index daafd5e46148c..5b52a49bc5208 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/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;
 }