Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ScopedLocalRef for new Strings in JNI" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-03 15:28:07 +00:00
committed by Android (Google) Code Review
parent abcfe41ed2 9615b0c6ad
commit 2348e76c09
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_hardware_input_InputWindowHandle.cpp
View File

@@ -325,8 +325,8 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn
"Failed to create new InputWindowHandle object."); "Failed to create new InputWindowHandle object.");
env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token, env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token,
javaObjectForIBinder(env, windowInfo.token)); javaObjectForIBinder(env, windowInfo.token));
env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.name, ScopedLocalRef<jstring> name(env, env->NewStringUTF(windowInfo.name.data()));
env->NewStringUTF(windowInfo.name.data())); env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.name, name.get());
env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsFlags, env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsFlags,
static_cast<uint32_t>(windowInfo.layoutParamsFlags.get())); static_cast<uint32_t>(windowInfo.layoutParamsFlags.get()));
env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsType, env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsType,
@@ -374,8 +374,9 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn
static_cast<int32_t>(windowInfo.touchOcclusionMode)); static_cast<int32_t>(windowInfo.touchOcclusionMode));
env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.ownerPid, windowInfo.ownerPid); env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.ownerPid, windowInfo.ownerPid);
env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.ownerUid, windowInfo.ownerUid); env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.ownerUid, windowInfo.ownerUid);
ScopedLocalRef<jstring> packageName(env, env->NewStringUTF(windowInfo.packageName.data()));
env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.packageName, env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.packageName,
env->NewStringUTF(windowInfo.packageName.data())); packageName.get());
env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.inputFeatures, env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.inputFeatures,
static_cast<int32_t>(windowInfo.inputFeatures.get())); static_cast<int32_t>(windowInfo.inputFeatures.get()));