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

Commit fb3cc116 authored by Arthur Hung's avatar Arthur Hung
Browse files

Fix led meta state can't be cleared by another keyboard 

Currently, the led meta state of CapsLock, NumLock and ScrollLock would
be stored in to a global state. If we connected with multiple keyboards,
and some keyboard changed the led state, others should clear their local
led state frist then update it by the global state so we could clear the
state per device properly.

Bug: 194465459
Test: atest inputflinger_tests
Change-Id: I5965cf951a5ebcadc69541b9a036fb38fd428d30
parent 35556594

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ void KeyboardInputMapper::initializeLedState(LedState& ledState, int32_t led) { 
}



void KeyboardInputMapper::updateLedState(bool reset) {

    // Clear the local led state then union the global led state.

    mMetaState &= ~(AMETA_CAPS_LOCK_ON | AMETA_NUM_LOCK_ON | AMETA_SCROLL_LOCK_ON);

    mMetaState |= getContext()->getLedMetaState();



    constexpr int32_t META_NUM = 3;

services/inputflinger/tests/InputReader_test.cpp

+72 −0
Original line number Diff line number Diff line
@@ -3999,6 +3999,78 @@ TEST_F(KeyboardInputMapperTest, Process_toggleCapsLockState) { 
    ASSERT_EQ(AMETA_CAPS_LOCK_ON, mapper.getMetaState());

}



TEST_F(KeyboardInputMapperTest, Process_LockedKeysShouldToggleInMultiDevices) {

    // keyboard 1.

    mFakeEventHub->addLed(EVENTHUB_ID, LED_CAPSL, true /*initially on*/);

    mFakeEventHub->addLed(EVENTHUB_ID, LED_NUML, false /*initially off*/);

    mFakeEventHub->addLed(EVENTHUB_ID, LED_SCROLLL, false /*initially off*/);

    mFakeEventHub->addKey(EVENTHUB_ID, KEY_CAPSLOCK, 0, AKEYCODE_CAPS_LOCK, 0);

    mFakeEventHub->addKey(EVENTHUB_ID, KEY_NUMLOCK, 0, AKEYCODE_NUM_LOCK, 0);

    mFakeEventHub->addKey(EVENTHUB_ID, KEY_SCROLLLOCK, 0, AKEYCODE_SCROLL_LOCK, 0);



    KeyboardInputMapper& mapper1 =

            addMapperAndConfigure<KeyboardInputMapper>(AINPUT_SOURCE_KEYBOARD,

                                                       AINPUT_KEYBOARD_TYPE_ALPHABETIC);



    // keyboard 2.

    const std::string USB2 = "USB2";

    const std::string DEVICE_NAME2 = "KEYBOARD2";

    constexpr int32_t SECOND_DEVICE_ID = DEVICE_ID + 1;

    constexpr int32_t SECOND_EVENTHUB_ID = EVENTHUB_ID + 1;

    std::shared_ptr<InputDevice> device2 =

            newDevice(SECOND_DEVICE_ID, DEVICE_NAME2, USB2, SECOND_EVENTHUB_ID,

                      ftl::Flags<InputDeviceClass>(0));

    mFakeEventHub->addLed(SECOND_EVENTHUB_ID, LED_CAPSL, true /*initially on*/);

    mFakeEventHub->addLed(SECOND_EVENTHUB_ID, LED_NUML, false /*initially off*/);

    mFakeEventHub->addLed(SECOND_EVENTHUB_ID, LED_SCROLLL, false /*initially off*/);

    mFakeEventHub->addKey(SECOND_EVENTHUB_ID, KEY_CAPSLOCK, 0, AKEYCODE_CAPS_LOCK, 0);

    mFakeEventHub->addKey(SECOND_EVENTHUB_ID, KEY_NUMLOCK, 0, AKEYCODE_NUM_LOCK, 0);

    mFakeEventHub->addKey(SECOND_EVENTHUB_ID, KEY_SCROLLLOCK, 0, AKEYCODE_SCROLL_LOCK, 0);



    KeyboardInputMapper& mapper2 =

            device2->addMapper<KeyboardInputMapper>(SECOND_EVENTHUB_ID, AINPUT_SOURCE_KEYBOARD,

                                                    AINPUT_KEYBOARD_TYPE_ALPHABETIC);

    device2->configure(ARBITRARY_TIME, mFakePolicy->getReaderConfiguration(), 0 /*changes*/);

    device2->reset(ARBITRARY_TIME);



    // Initial metastate is AMETA_NUM_LOCK_ON, turn it off.

    ASSERT_TRUE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_NUML));

    ASSERT_EQ(AMETA_NUM_LOCK_ON, mapper1.getMetaState());

    ASSERT_EQ(AMETA_NUM_LOCK_ON, mapper2.getMetaState());



    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_NUMLOCK, 1);

    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_NUMLOCK, 0);

    ASSERT_FALSE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_NUML));

    ASSERT_EQ(AMETA_NONE, mapper1.getMetaState());

    ASSERT_EQ(AMETA_NONE, mapper2.getMetaState());



    // Toggle caps lock on and off.

    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 1);

    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 0);

    ASSERT_TRUE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_CAPSL));

    ASSERT_EQ(AMETA_CAPS_LOCK_ON, mapper1.getMetaState());

    ASSERT_EQ(AMETA_CAPS_LOCK_ON, mapper2.getMetaState());



    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 1);

    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 0);

    ASSERT_FALSE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_CAPSL));

    ASSERT_EQ(AMETA_NONE, mapper1.getMetaState());

    ASSERT_EQ(AMETA_NONE, mapper2.getMetaState());



    // Toggle scroll lock on and off.

    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 1);

    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 0);

    ASSERT_TRUE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_SCROLLL));

    ASSERT_EQ(AMETA_SCROLL_LOCK_ON, mapper1.getMetaState());

    ASSERT_EQ(AMETA_SCROLL_LOCK_ON, mapper2.getMetaState());



    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 1);

    process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 0);

    ASSERT_FALSE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_SCROLLL));

    ASSERT_EQ(AMETA_NONE, mapper1.getMetaState());

    ASSERT_EQ(AMETA_NONE, mapper2.getMetaState());

}



// --- KeyboardInputMapperTest_ExternalDevice ---



class KeyboardInputMapperTest_ExternalDevice : public InputMapperTest {