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 rvc-dev

Browse Source
This commit is contained in:
Josep del Río
2023-07-10 13:10:54 +00:00
committed by Android (Google) Code Review
parent d40861be65 4b3c462016
commit 6676e5a88b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_view_InputDevice.cpp
View File

@@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <binder/Parcel.h>
#include <input/Input.h> #include <input/Input.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
@@ -48,9 +49,16 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi
return NULL; return NULL;
} }
sp<KeyCharacterMap> map = deviceInfo.getKeyCharacterMap();
if (map != nullptr) {
Parcel parcel;
map->writeToParcel(&parcel);
map = map->readFromParcel(&parcel);
}
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;
} }