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

Commit e88ab061 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Gerrit Code Review
Browse files

Merge "Cancel only the gesture corresponding to the dropped event" into main

parents 767bb25c 3cfa7387

services/inputflinger/dispatcher/InputDispatcher.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -1326,6 +1326,9 @@ void InputDispatcher::dropInboundEventLocked(const EventEntry& entry, DropReason 
    switch (entry.type) {

    switch (entry.type) {

        case EventEntry::Type::KEY: {

        case EventEntry::Type::KEY: {

            CancelationOptions options(CancelationOptions::Mode::CANCEL_NON_POINTER_EVENTS, reason);

            CancelationOptions options(CancelationOptions::Mode::CANCEL_NON_POINTER_EVENTS, reason);

            const KeyEntry& keyEntry = static_cast<const KeyEntry&>(entry);

            options.displayId = keyEntry.displayId;

            options.deviceId = keyEntry.deviceId;

            synthesizeCancelationEventsForAllConnectionsLocked(options);

            synthesizeCancelationEventsForAllConnectionsLocked(options);

            break;

            break;

        }

        }
@@ -1333,10 +1336,14 @@ void InputDispatcher::dropInboundEventLocked(const EventEntry& entry, DropReason 
            const MotionEntry& motionEntry = static_cast<const MotionEntry&>(entry);

            const MotionEntry& motionEntry = static_cast<const MotionEntry&>(entry);

            if (motionEntry.source & AINPUT_SOURCE_CLASS_POINTER) {

            if (motionEntry.source & AINPUT_SOURCE_CLASS_POINTER) {

                CancelationOptions options(CancelationOptions::Mode::CANCEL_POINTER_EVENTS, reason);

                CancelationOptions options(CancelationOptions::Mode::CANCEL_POINTER_EVENTS, reason);

                options.displayId = motionEntry.displayId;

                options.deviceId = motionEntry.deviceId;

                synthesizeCancelationEventsForAllConnectionsLocked(options);

                synthesizeCancelationEventsForAllConnectionsLocked(options);

            } else {

            } else {

                CancelationOptions options(CancelationOptions::Mode::CANCEL_NON_POINTER_EVENTS,

                CancelationOptions options(CancelationOptions::Mode::CANCEL_NON_POINTER_EVENTS,

                                           reason);

                                           reason);

                options.displayId = motionEntry.displayId;

                options.deviceId = motionEntry.deviceId;

                synthesizeCancelationEventsForAllConnectionsLocked(options);

                synthesizeCancelationEventsForAllConnectionsLocked(options);

            }

            }

            break;

            break;