diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-11-10 16:00:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-10 16:00:37 -0800 |
| commit | 00e5dd44f6d014fff8c65b9c718f5641f5eae4bb (patch) | |
| tree | fd669cb73cfaec3fdf1bf836636439b8d2f153ce | |
| parent | 77f5c9542e159cb9f2f2908227212d4add8ce74c (diff) | |
| parent | 8f6068e63ec93c671412bafee44e69fb73adecf6 (diff) | |
| download | base-00e5dd44f6d014fff8c65b9c718f5641f5eae4bb.tar.gz | |
Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
| -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 45fd5a094142..ec172bba528f 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: { |