summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/jni/android_media_AudioRecord.cpp4
-rw-r--r--core/jni/android_media_AudioTrack.cpp4
-rw-r--r--core/jni/android_media_ToneGenerator.cpp5
3 files changed, 0 insertions, 13 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index d6d5ddef4aa4..da2f874281b9 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -224,10 +224,6 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this,
// create an uninitialized AudioRecord object
sp<AudioRecord> lpRecorder = new AudioRecord();
- if (lpRecorder == NULL) {
- ALOGE("Error creating AudioRecord instance.");
- return AUDIORECORD_ERROR_SETUP_NATIVEINITFAILED;
- }
// create the callback information:
// this data will be passed with every AudioRecord callback
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index 24e4cd70f94d..887cf430a54d 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -295,10 +295,6 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th
// create the native AudioTrack object
sp<AudioTrack> lpTrack = new AudioTrack();
- if (lpTrack == NULL) {
- ALOGE("Error creating uninitialized AudioTrack");
- return AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED;
- }
// initialize the callback information:
// this data will be passed with every AudioTrack callback
diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp
index da6f1ed4040d..4e6ee4ac181d 100644
--- a/core/jni/android_media_ToneGenerator.cpp
+++ b/core/jni/android_media_ToneGenerator.cpp
@@ -93,11 +93,6 @@ static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz,
ALOGV("android_media_ToneGenerator_native_setup jobject: %x", (int)thiz);
- if (lpToneGen == NULL) {
- ALOGE("ToneGenerator creation failed");
- jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
- return;
- }
ALOGV("ToneGenerator lpToneGen: %x", (unsigned int)lpToneGen);
if (!lpToneGen->isInited()) {