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

Commit 5588a7ec authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add ScopedLocalRef for new Strings in JNI" into tm-dev am: 2348e76c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17058862

Change-Id: Ie9a9ace71277a40dd94a6ecdf2b6b7ff72084943
parents c1a5d74f 2348e76c

core/jni/android_hardware_input_InputWindowHandle.cpp

+4 −3
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn 
                        "Failed to create new InputWindowHandle object.");

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token,

                        javaObjectForIBinder(env, windowInfo.token));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.name,

                        env->NewStringUTF(windowInfo.name.data()));

    ScopedLocalRef<jstring> name(env, env->NewStringUTF(windowInfo.name.data()));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.name, name.get());

    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsFlags,

                     static_cast<uint32_t>(windowInfo.layoutParamsFlags.get()));

    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsType,
@@ -374,8 +374,9 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn 
                     static_cast<int32_t>(windowInfo.touchOcclusionMode));

    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.ownerPid, windowInfo.ownerPid);

    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.ownerUid, windowInfo.ownerUid);

    ScopedLocalRef<jstring> packageName(env, env->NewStringUTF(windowInfo.packageName.data()));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.packageName,

                        env->NewStringUTF(windowInfo.packageName.data()));

                        packageName.get());

    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.inputFeatures,

                     static_cast<int32_t>(windowInfo.inputFeatures.get()));