diff options
| author | Eric Laurent <elaurent@google.com> | 2015-06-19 16:46:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 16:46:30 +0000 |
| commit | 1f98e79abd97e295d1e1f309102691c7e1c422c5 (patch) | |
| tree | f7257527eaff7e0e2764582fc8fac904b8fbc4ce /media/jni | |
| parent | 8f4ccd6c968b9488bbf74431fb20e9de144772af (diff) | |
| parent | 077999844f306d31d3ea9593b7e7b2f06e7f7483 (diff) | |
| download | frameworks_base-1f98e79abd97e295d1e1f309102691c7e1c422c5.zip frameworks_base-1f98e79abd97e295d1e1f309102691c7e1c422c5.tar.gz frameworks_base-1f98e79abd97e295d1e1f309102691c7e1c422c5.tar.bz2 | |
Merge "audio effect JNI: fix global ref leak." into mnc-dev
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 2 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index fdc586b..aba4bbe 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -472,6 +472,8 @@ static void android_media_AudioEffect_native_release(JNIEnv *env, jobject thiz) if (lpJniStorage) { ALOGV("deleting pJniStorage: %p\n", lpJniStorage); + env->DeleteGlobalRef(lpJniStorage->mCallbackData.audioEffect_class); + env->DeleteGlobalRef(lpJniStorage->mCallbackData.audioEffect_ref); delete lpJniStorage; } } diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index 6098b4a..0557019 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -450,6 +450,8 @@ static void android_media_visualizer_native_release(JNIEnv *env, jobject thiz) if (lpJniStorage) { ALOGV("deleting pJniStorage: %p\n", lpJniStorage); + env->DeleteGlobalRef(lpJniStorage->mCallbackData.visualizer_class); + env->DeleteGlobalRef(lpJniStorage->mCallbackData.visualizer_ref); delete lpJniStorage; } } |