diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-11-10 16:04:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-10 16:04:13 -0800 |
| commit | 5314335c9e28673923ad034e5f8a5ba765552a08 (patch) | |
| tree | 1646bc1e78c21163cf85c057c3e9a921f4be02d4 /core | |
| parent | d4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2 (diff) | |
| parent | 00e5dd44f6d014fff8c65b9c718f5641f5eae4bb (diff) | |
| download | frameworks_base-5314335c9e28673923ad034e5f8a5ba765552a08.zip frameworks_base-5314335c9e28673923ad034e5f8a5ba765552a08.tar.gz frameworks_base-5314335c9e28673923ad034e5f8a5ba765552a08.tar.bz2 | |
am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_app_NativeActivity.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index 45fd5a0..ec172bb 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -580,6 +580,7 @@ static int mainWorkCallback(int fd, int events, void* data) { code->env->CallVoidMethod(code->clazz, gNativeActivityClassInfo.dispatchUnhandledKeyEvent, inputEventObj); checkAndClearExceptionFromCallback(code->env, "dispatchUnhandledKeyEvent"); + code->env->DeleteLocalRef(inputEventObj); code->nativeInputQueue->finishEvent(keyEvent, true); } int seq; @@ -589,6 +590,7 @@ static int mainWorkCallback(int fd, int events, void* data) { code->env->CallVoidMethod(code->clazz, gNativeActivityClassInfo.preDispatchKeyEvent, inputEventObj, seq); checkAndClearExceptionFromCallback(code->env, "preDispatchKeyEvent"); + code->env->DeleteLocalRef(inputEventObj); } } break; case CMD_FINISH: { |