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

* commit 'ac598888e3efbb6fda910ac8bef3bc92811309ba':
  audiosystem JNI: check env pointer before use.

1 files changed, 6 insertions, 1 deletions

diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index f09928979be4..4b4b367794c2 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -160,6 +160,9 @@ JNIAudioPortCallback::~JNIAudioPortCallback()
 {
     // remove global references
     JNIEnv *env = AndroidRuntime::getJNIEnv();
+    if (env == NULL) {
+        return;
+    }
     env->DeleteGlobalRef(mObject);
     env->DeleteGlobalRef(mClass);
 }
@@ -167,7 +170,9 @@ JNIAudioPortCallback::~JNIAudioPortCallback()
 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()) {