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

Merge "Do not share key mappings with JNI object" into sc-dev

Browse Source
This commit is contained in:
Josep del Río
2023-07-08 07:21:43 +00:00
committed by Android (Google) Code Review
parent 56cbe2e163 3d993de0d1
commit 4a45e9c435
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/android_view_InputDevice.cpp
View File

@@ -42,6 +42,13 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi
return NULL; return NULL;
} }
// b/274058082: Pass a copy of the key character map to avoid concurrent
// access
std::shared_ptr<KeyCharacterMap> map = deviceInfo.getKeyCharacterMap();
if (map != nullptr) {
map = std::make_shared<KeyCharacterMap>(*map);
}
ScopedLocalRef<jstring> descriptorObj(env, ScopedLocalRef<jstring> descriptorObj(env,
env->NewStringUTF(deviceInfo.getIdentifier().descriptor.c_str())); env->NewStringUTF(deviceInfo.getIdentifier().descriptor.c_str()));
if (!descriptorObj.get()) { if (!descriptorObj.get()) {
@@ -49,8 +56,8 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi
} }
ScopedLocalRef<jobject> kcmObj(env, ScopedLocalRef<jobject> kcmObj(env,
android_view_KeyCharacterMap_create(env, deviceInfo.getId(), android_view_KeyCharacterMap_create(env, deviceInfo.getId(),
deviceInfo.getKeyCharacterMap())); map));
if (!kcmObj.get()) { if (!kcmObj.get()) {
return NULL; return NULL;
} }