Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5314335c authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread 

* commit '00e5dd44':
  Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
parents d4b5d85e 00e5dd44

core/jni/android_app_NativeActivity.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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: {