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

Commit 2e55547a authored by Ken Wakasa's avatar Ken Wakasa Committed by The Android Automerger
Browse files

Revert "Stop marking gamepads as keyboards" 

This reverts commit 74c8fb60.

Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
parent 1f902a55

services/input/EventHub.cpp

+5 −8
Original line number Diff line number Diff line
@@ -1188,6 +1188,11 @@ 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) &&
@@ -1205,14 +1210,6 @@ 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)) {