From 2b4d25be789ae2c4148d12fa7aa894bd5ff484d3 Mon Sep 17 00:00:00 2001 From: chaviw Date: Wed, 30 Mar 2022 11:24:30 -0500 Subject: [PATCH] Add ScopedLocalRef for javaObjectForIBinder javaObjectForIBinder creates a Java object that is not getting freed. Wrap all javaObjectForIBinder calls with ScopedLocalRef so they're automatically cleaned up Test: Builds Bug: 225287201 Change-Id: Id5970ef8b1ff256ebc404d4242819728f120050d --- core/jni/android_hardware_input_InputApplicationHandle.cpp | 5 +++-- core/jni/android_hardware_input_InputWindowHandle.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/jni/android_hardware_input_InputApplicationHandle.cpp b/core/jni/android_hardware_input_InputApplicationHandle.cpp index 24d35316ef208..eab4e1d744cf0 100644 --- a/core/jni/android_hardware_input_InputApplicationHandle.cpp +++ b/core/jni/android_hardware_input_InputApplicationHandle.cpp @@ -105,10 +105,11 @@ std::shared_ptr android_view_InputApplicationHandle_getH jobject android_view_InputApplicationHandle_fromInputApplicationInfo( JNIEnv* env, gui::InputApplicationInfo inputApplicationInfo) { - jobject binderObject = javaObjectForIBinder(env, inputApplicationInfo.token); + ScopedLocalRef binderObject(env, + javaObjectForIBinder(env, inputApplicationInfo.token)); ScopedLocalRef name(env, env->NewStringUTF(inputApplicationInfo.name.data())); return env->NewObject(gInputApplicationHandleClassInfo.clazz, - gInputApplicationHandleClassInfo.ctor, binderObject, name.get(), + gInputApplicationHandleClassInfo.ctor, binderObject.get(), name.get(), inputApplicationInfo.dispatchingTimeoutMillis); } diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp index db92310f2a261..484d92820b862 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -261,8 +261,8 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn } LOG_ALWAYS_FATAL_IF(inputWindowHandle == nullptr, "Failed to create new InputWindowHandle object."); - env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token, - javaObjectForIBinder(env, windowInfo.token)); + ScopedLocalRef token(env, javaObjectForIBinder(env, windowInfo.token)); + env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token, token.get()); ScopedLocalRef name(env, env->NewStringUTF(windowInfo.name.data())); env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.name, name.get()); env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsFlags, @@ -317,8 +317,9 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn ScopedLocalRef matrixObj(env, AMatrix_newInstance(env, transformVals)); env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.transform, matrixObj.get()); + ScopedLocalRef windowToken(env, javaObjectForIBinder(env, windowInfo.windowToken)); env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.windowToken, - javaObjectForIBinder(env, windowInfo.windowToken)); + windowToken.get()); return inputWindowHandle; }