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

Commit 3d993de0 authored by Josep del Rio's avatar Josep del Rio
Browse files

Do not share key mappings with JNI object 

The key mapping information between the native key mappings and
the KeyCharacterMap object available in Java is currently shared,
which means that a read can be attempted while it's being modified.

Bug: 274058082
Test: Patch tested by Oppo
Change-Id: I745008a0a8ea30830660c45dcebee917b3913d13
parent 8c66a8b3

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;

    }