Merge "Stop marking gamepads as keyboards" into jb-mr2-dev (f7104136) · Commits · e / os / android_frameworks_base

services/input/EventHub.cpp

+8 −5

Original line number	Diff line number	Diff line
		@@ -1188,11 +1188,6 @@ status_t EventHub::openDeviceLocked(const char *devicePath) {
		mBuiltInKeyboardId = device->id;
		}

		// 'Q' key support = cheap test of whether this is an alpha-capable kbd
		if (hasKeycodeLocked(device, AKEYCODE_Q)) {
		device->classes \|= INPUT_DEVICE_CLASS_ALPHAKEY;
		}

		// See if this device has a DPAD.
		if (hasKeycodeLocked(device, AKEYCODE_DPAD_UP) &&
		hasKeycodeLocked(device, AKEYCODE_DPAD_DOWN) &&
		@@ -1210,6 +1205,14 @@ status_t EventHub::openDeviceLocked(const char *devicePath) {
		}
		}

		// 'Q' key support = cheap test of whether this is an alpha-capable kbd. Many gamepads will
		// report a broader set of HID usages than they need, however, so we only want to mark this
		// device as a keyboard if it is not a gamepad.
		if (hasKeycodeLocked(device, AKEYCODE_Q) &&
		!(device->classes & INPUT_DEVICE_CLASS_GAMEPAD)) {
		device->classes \|= INPUT_DEVICE_CLASS_ALPHAKEY;
		}

		// Disable kernel key repeat since we handle it ourselves
		unsigned int repeatRate[] = {0,0};
		if (ioctl(fd, EVIOCSREP, repeatRate)) {