diff options
| author | 2022-03-03 15:28:07 +0000 | |
|---|---|---|
| committer | 2022-03-03 15:28:07 +0000 | |
| commit | 2348e76c09e231e4b1abd5e07377aaac6182c19d (patch) | |
| tree | 2cd5b0ab3693a8f36b80af4fb5bbe6e8921d8883 | |
| parent | abcfe41ed269b69bacb8a0521a786d879df46b63 (diff) | |
| parent | 9615b0c6ad92dd5486b4f6dbfcc6290867a48e45 (diff) | |
Merge "Add ScopedLocalRef for new Strings in JNI" into tm-dev
| -rw-r--r-- | core/jni/android_hardware_input_InputWindowHandle.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp index 93ce37755f94..f453d1f06e22 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -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())); |