Merge "Fix key location API, when many to one key mapping with KL flags" into main (f0bf07f9) · Commits · e / os / android_frameworks_native

libs/input/KeyLayoutMap.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -240,8 +240,9 @@ const KeyLayoutMap::Key* KeyLayoutMap::getKey(int32_t scanCode, int32_t usageCod

		std::vector<int32_t> KeyLayoutMap::findScanCodesForKey(int32_t keyCode) const {
		std::vector<int32_t> scanCodes;
		// b/354333072: Only consider keys without FUNCTION flag
		for (const auto& [scanCode, key] : mKeysByScanCode) {
		if (keyCode == key.keyCode) {
		if (keyCode == key.keyCode && !(key.flags & POLICY_FLAG_FUNCTION)) {
		scanCodes.push_back(scanCode);
		}
		}