Merge "Allow resetting locked modifier state" into main (6501473c) · Commits · e / os / android_frameworks_native

services/inputflinger/include/InputReaderBase.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -362,6 +362,9 @@ public:
		/* Toggle Caps Lock */
		virtual void toggleCapsLockState(int32_t deviceId) = 0;

		/* Resets locked modifier state */
		virtual void resetLockedModifierState() = 0;

		/* Determine whether physical keys exist for the given framework-domain key codes. */
		virtual bool hasKeys(int32_t deviceId, uint32_t sourceMask,
		const std::vector<int32_t>& keyCodes, uint8_t* outFlags) = 0;

+5 −0

Original line number	Diff line number	Diff line
		@@ -590,6 +590,11 @@ void InputReader::toggleCapsLockState(int32_t deviceId) {
		}
		}

		void InputReader::resetLockedModifierState() {
		std::scoped_lock _l(mLock);
		updateLedMetaStateLocked(0);
		}

		bool InputReader::hasKeys(int32_t deviceId, uint32_t sourceMask,
		const std::vector<int32_t>& keyCodes, uint8_t* outFlags) {
		std::scoped_lock _l(mLock);

+2 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ public:

		void toggleCapsLockState(int32_t deviceId) override;

		void resetLockedModifierState() override;

		bool hasKeys(int32_t deviceId, uint32_t sourceMask, const std::vector<int32_t>& keyCodes,
		uint8_t* outFlags) override;

+27 −0

Original line number	Diff line number	Diff line
		@@ -926,6 +926,33 @@ TEST_F(KeyboardInputMapperTest, Process_toggleCapsLockState) {
		ASSERT_EQ(AMETA_CAPS_LOCK_ON, mapper.getMetaState());
		}

		TEST_F(KeyboardInputMapperTest, Process_ResetLockedModifierState) {
		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& mapper =
		constructAndAddMapper<KeyboardInputMapper>(AINPUT_SOURCE_KEYBOARD);
		// Initial metastate is AMETA_NONE.
		ASSERT_EQ(AMETA_NONE, mapper.getMetaState());

		// Toggle caps lock on.
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 1);
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 0);

		// Toggle num lock on.
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_NUMLOCK, 1);
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_NUMLOCK, 0);

		// Toggle scroll lock on.
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 1);
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 0);
		ASSERT_EQ(AMETA_CAPS_LOCK_ON \| AMETA_NUM_LOCK_ON \| AMETA_SCROLL_LOCK_ON, mapper.getMetaState());

		mReader->resetLockedModifierState();
		ASSERT_EQ(AMETA_NONE, mapper.getMetaState());
		}

		TEST_F(KeyboardInputMapperTest, Process_LockedKeysShouldToggleInMultiDevices) {
		// keyboard 1.
		mFakeEventHub->addLed(EVENTHUB_ID, LED_CAPSL, true /initially on/);

+3 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,8 @@ public:

		void toggleCapsLockState(int32_t deviceId) { reader->toggleCapsLockState(deviceId); }

		void resetLockedModifierState() { reader->resetLockedModifierState(); }

		bool hasKeys(int32_t deviceId, uint32_t sourceMask, const std::vector<int32_t>& keyCodes,
		uint8_t* outFlags) {
		return reader->hasKeys(deviceId, sourceMask, keyCodes, outFlags);
		@@ -226,6 +228,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t* data, size_t size) {
		fdp->ConsumeIntegral<int32_t>());
		},
		[&]() -> void { reader->toggleCapsLockState(fdp->ConsumeIntegral<int32_t>()); },
		[&]() -> void { reader->resetLockedModifierState(); },
		[&]() -> void {
		size_t count = fdp->ConsumeIntegralInRange<size_t>(1, 1024);
		std::vector<uint8_t> outFlags(count);