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

Commit a4b17398 authored Apr 07, 2023 by Josep del Río Committed by Automerger Merge Worker Apr 07, 2023

Merge "hasKeycodeLocked() also checks usage codes" am: 8521bfe7 am:...

Merge "hasKeycodeLocked() also checks usage codes" am: 8521bfe7 am: c224482a am: 48a44019 am: d618fcc6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2514955

Change-Id: I2a99ee0991f9bd4afe65aa7e9eb498beba0e9aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5f06a154 d618fcc6

include/input/KeyLayoutMap.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,7 @@ public:
	int32_t* outKeyCode, uint32_t* outFlags) const;		int32_t* outKeyCode, uint32_t* outFlags) const;
	std::vector<int32_t> findScanCodesForKey(int32_t keyCode) const;		std::vector<int32_t> findScanCodesForKey(int32_t keyCode) const;
	std::optional<int32_t> findScanCodeForLed(int32_t ledCode) const;		std::optional<int32_t> findScanCodeForLed(int32_t ledCode) const;
			std::vector<int32_t> findUsageCodesForKey(int32_t keyCode) const;
	std::optional<int32_t> findUsageCodeForLed(int32_t ledCode) const;		std::optional<int32_t> findUsageCodeForLed(int32_t ledCode) const;

	std::optional<AxisInfo> mapAxis(int32_t scanCode) const;		std::optional<AxisInfo> mapAxis(int32_t scanCode) const;

libs/input/KeyLayoutMap.cpp

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -247,6 +247,16 @@ std::vector<int32_t> KeyLayoutMap::findScanCodesForKey(int32_t keyCode) const {
	return scanCodes;		return scanCodes;
	}		}

			std::vector<int32_t> KeyLayoutMap::findUsageCodesForKey(int32_t keyCode) const {
			std::vector<int32_t> usageCodes;
			for (const auto& [usageCode, key] : mKeysByUsageCode) {
			if (keyCode == key.keyCode) {
			usageCodes.push_back(usageCode);
			}
			}
			return usageCodes;
			}

	std::optional<AxisInfo> KeyLayoutMap::mapAxis(int32_t scanCode) const {		std::optional<AxisInfo> KeyLayoutMap::mapAxis(int32_t scanCode) const {
	auto it = mAxes.find(scanCode);		auto it = mAxes.find(scanCode);
	if (it == mAxes.end()) {		if (it == mAxes.end()) {

services/inputflinger/reader/EventHub.cpp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -634,6 +634,11 @@ bool EventHub::Device::hasKeycodeLocked(int keycode) const {
	}		}
	}		}

			std::vector<int32_t> usageCodes = keyMap.keyLayoutMap->findUsageCodesForKey(keycode);
			if (usageCodes.size() > 0 && mscBitmask.test(MSC_SCAN)) {
			return true;
			}

	return false;		return false;
	}		}