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

Commit 77cbfcd9 authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "Do not share key mappings with JNI object" into sc-dev am: 4a45e9c4 

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



Change-Id: Iea8d6a7ae04318e48fe0bf41ba9013e7e47e3f41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6df15797 4a45e9c4

core/jni/android_view_InputDevice.cpp

+9 −2
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi 
        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,

            env->NewStringUTF(deviceInfo.getIdentifier().descriptor.c_str()));

    if (!descriptorObj.get()) {
@@ -50,7 +57,7 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi 


    ScopedLocalRef<jobject> kcmObj(env,

                                   android_view_KeyCharacterMap_create(env, deviceInfo.getId(),

            deviceInfo.getKeyCharacterMap()));

                                                                       map));

    if (!kcmObj.get()) {

        return NULL;

    }