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

Commit 0a6fee80 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Force input device changed callback when Keyboard layout info is updated 

Virtual keyboard creation uses KEYBOARD_LAYOUT_ASSOCIATION reconfig to
associated input device with keyboard layout info. But this can
happen after input device added (Race condition between device creation
and input device added callback.)
If input device already added then we sometimes don't get input device
changed callback since the generation is same.

Test: atest VirtualKeyboardLayoutTest
Bug: 277778640
Change-Id: I218b6d797da27ec3a383fbcd2ebeacb0afbf5fab
parent 60508923

include/input/InputDevice.h

+5 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ struct KeyboardLayoutInfo { 
    std::string languageTag;

    // The layout type such as QWERTY or AZERTY.

    std::string layoutType;



    inline bool operator==(const KeyboardLayoutInfo& other) const {

        return languageTag == other.languageTag && layoutType == other.layoutType;

    }

    inline bool operator!=(const KeyboardLayoutInfo& other) const { return !(*this == other); }

};



// The version of the Universal Stylus Initiative (USI) protocol supported by the input device.

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

+5 −1
Original line number Diff line number Diff line
@@ -148,8 +148,12 @@ std::list<NotifyArgs> KeyboardInputMapper::reconfigure(nsecs_t when, 


    if (!changes.any() ||

        changes.test(InputReaderConfiguration::Change::KEYBOARD_LAYOUT_ASSOCIATION)) {

        mKeyboardLayoutInfo =

        std::optional<KeyboardLayoutInfo> newKeyboardLayoutInfo =

                getValueByKey(config.keyboardLayoutAssociations, getDeviceContext().getLocation());

        if (mKeyboardLayoutInfo != newKeyboardLayoutInfo) {

            mKeyboardLayoutInfo = newKeyboardLayoutInfo;

            bumpGeneration();

        }

    }



    return out;

services/inputflinger/tests/InputReader_test.cpp

+9 −0
Original line number Diff line number Diff line
@@ -3687,6 +3687,7 @@ TEST_F(KeyboardInputMapperTest, Configure_AssignKeyboardLayoutInfo) { 
            mDevice->configure(ARBITRARY_TIME, mFakePolicy->getReaderConfiguration(),

                               /*changes=*/{});













    uint32_t generation = mReader->getContext()->getGeneration();















    mFakePolicy->addKeyboardLayoutAssociation(DEVICE_LOCATION, DEVICE_KEYBOARD_LAYOUT_INFO);





























    unused += mDevice->configure(ARBITRARY_TIME, mFakePolicy->getReaderConfiguration(),









@@ -3697,6 +3698,14 @@ TEST_F(KeyboardInputMapperTest, Configure_AssignKeyboardLayoutInfo) {













              deviceInfo.getKeyboardLayoutInfo()->languageTag);















    ASSERT_EQ(DEVICE_KEYBOARD_LAYOUT_INFO.layoutType,















              deviceInfo.getKeyboardLayoutInfo()->layoutType);













    ASSERT_TRUE(mReader->getContext()->getGeneration() != generation);

























    // Call change layout association with the same values: Generation shouldn't change













    generation = mReader->getContext()->getGeneration();













    mFakePolicy->addKeyboardLayoutAssociation(DEVICE_LOCATION, DEVICE_KEYBOARD_LAYOUT_INFO);













    unused += mDevice->configure(ARBITRARY_TIME, mFakePolicy->getReaderConfiguration(),













                                 InputReaderConfiguration::Change::KEYBOARD_LAYOUT_ASSOCIATION);













    ASSERT_TRUE(mReader->getContext()->getGeneration() == generation);















}





























TEST_F(KeyboardInputMapperTest, LayoutInfoCorrectlyMapped) {