Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: edd4a22

* commit 'edd4a227e5f49b859f16105a100568fcef4927a3':
  audiosystem JNI: check env pointer before use.
This commit is contained in:
Eric Laurent
2014-11-12 21:19:15 +00:00
committed by android-build-merger
parent 5f02d29550 edd4a227e5
commit ac598888e3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_media_AudioSystem.cpp
View File

@@ -160,6 +160,9 @@ JNIAudioPortCallback::~JNIAudioPortCallback()
{ {
// remove global references // remove global references
JNIEnv *env = AndroidRuntime::getJNIEnv(); JNIEnv *env = AndroidRuntime::getJNIEnv();
if (env == NULL) {
return;
}
env->DeleteGlobalRef(mObject); env->DeleteGlobalRef(mObject);
env->DeleteGlobalRef(mClass); env->DeleteGlobalRef(mClass);
} }
@@ -167,7 +170,9 @@ JNIAudioPortCallback::~JNIAudioPortCallback()
void JNIAudioPortCallback::sendEvent(int event) void JNIAudioPortCallback::sendEvent(int event)
{ {
JNIEnv *env = AndroidRuntime::getJNIEnv(); JNIEnv *env = AndroidRuntime::getJNIEnv();
if (env == NULL) {
return;
}
env->CallStaticVoidMethod(mClass, gPostEventFromNative, mObject, env->CallStaticVoidMethod(mClass, gPostEventFromNative, mObject,
event, 0, 0, NULL); event, 0, 0, NULL);
if (env->ExceptionCheck()) { if (env->ExceptionCheck()) {