summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-10-15 12:33:16 -0700
committerEric Laurent <elaurent@google.com>2010-10-15 12:33:16 -0700
commit0e7a4d9edcee63c6b770db9b6fe792abad5d7b53 (patch)
tree91df982c813ac0943e0482e3a7d2877d2379c541
parentefb581018bbede2ecdc76bcd9722ded5b6903254 (diff)
downloadframeworks_base-0e7a4d9edcee63c6b770db9b6fe792abad5d7b53.zip
frameworks_base-0e7a4d9edcee63c6b770db9b6fe792abad5d7b53.tar.gz
frameworks_base-0e7a4d9edcee63c6b770db9b6fe792abad5d7b53.tar.bz2
Fix issue 3098880.
Test value returned by getJNIEnv() in android_media_AudioSystem_error_callback() and exit if NULL. Change-Id: If30e5a05c585f34c66e6ad8cece3f7b46ef4be8e
-rw-r--r--core/jni/android_media_AudioSystem.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 3995026..40b9334 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -99,6 +99,10 @@ android_media_AudioSystem_getParameters(JNIEnv *env, jobject thiz, jstring keys)
void android_media_AudioSystem_error_callback(status_t err)
{
JNIEnv *env = AndroidRuntime::getJNIEnv();
+ if (env == NULL) {
+ return;
+ }
+
jclass clazz = env->FindClass("android/media/AudioSystem");
int error;