commit edd4a227e5f49b859f16105a100568fcef4927a3
author Eric Laurent <elaurent@google.com> Wed Nov 12 20:19:51 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 12 20:19:52 2014 +0000
tree e63c492dde497587b3fbf6fba64cb92cd28468a9
parent 850ec91e88c2b0911f8460f909eabf4078b78582
parent 449c5887101047d187a55217ced6d8a5c98fb367

Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev

core/jni/android_media_AudioSystem.cpp

diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index f099289..4b4b367 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -160,6 +160,9 @@
 {
     // remove global references
     JNIEnv *env = AndroidRuntime::getJNIEnv();
+    if (env == NULL) {
+        return;
+    }
     env->DeleteGlobalRef(mObject);
     env->DeleteGlobalRef(mClass);
 }
@@ -167,7 +170,9 @@
 void JNIAudioPortCallback::sendEvent(int event)
 {
     JNIEnv *env = AndroidRuntime::getJNIEnv();
-
+    if (env == NULL) {
+        return;
+    }
     env->CallStaticVoidMethod(mClass, gPostEventFromNative, mObject,
                               event, 0, 0, NULL);
     if (env->ExceptionCheck()) {