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

Commit d6401253 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix joystick and trackpad regression."

parents 6e24576b 2e45fb6f

services/input/InputDispatcher.cpp

+6 −0
Original line number Diff line number Diff line
@@ -4279,6 +4279,12 @@ bool InputDispatcher::InputState::trackMotion(const MotionEntry* entry, 
            memento.setPointers(entry);

            return true;

        }

        if (actionMasked == AMOTION_EVENT_ACTION_MOVE

                && (entry->source & (AINPUT_SOURCE_CLASS_JOYSTICK

                        | AINPUT_SOURCE_CLASS_NAVIGATION))) {

            // Joysticks and trackballs can send MOVE events without corresponding DOWN or UP.

            return true;

        }

#if DEBUG_OUTBOUND_EVENT_DETAILS

        LOGD("Dropping inconsistent motion pointer up/down or move event: "

                "deviceId=%d, source=%08x, actionMasked=%d",

services/input/InputReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ void InputDevice::process(const RawEvent* rawEvents, size_t count) { 
    for (const RawEvent* rawEvent = rawEvents; count--; rawEvent++) {

#if DEBUG_RAW_EVENTS

        LOGD("Input event: device=%d type=0x%04x scancode=0x%04x "

                "keycode=0x%04x value=0x%04x flags=0x%08x",

                "keycode=0x%04x value=0x%08x flags=0x%08x",

                rawEvent->deviceId, rawEvent->type, rawEvent->scanCode, rawEvent->keyCode,

                rawEvent->value, rawEvent->flags);

#endif