summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-10-15 17:18:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-15 17:18:35 -0700
commit208bb08a8b4896bc51b44aeec41b91d4726007cf (patch)
tree0665d2d2632b4a567dc4e9f6e9d90ad8f8212e54 /core
parent5e7b7cd65bea53357ecad68a31a52883897c824b (diff)
parent0e7a4d9edcee63c6b770db9b6fe792abad5d7b53 (diff)
downloadframeworks_base-208bb08a8b4896bc51b44aeec41b91d4726007cf.zip
frameworks_base-208bb08a8b4896bc51b44aeec41b91d4726007cf.tar.gz
frameworks_base-208bb08a8b4896bc51b44aeec41b91d4726007cf.tar.bz2
Merge "Fix issue 3098880." into gingerbread
Diffstat (limited to 'core')
-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;