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

Commit 23181337 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Ensure canceled touch stream uses previous display id 

We are observing inconsistent event streams being sent out of
TouchInputMapper. Whenever display id associated with a specific device
changes while touch is in progress, the generated ACTION_CANCEL event
has the new display id instead of the original one.

This causes issues later in the pipeline. In the case when a11y is ON,
the events are sent to a11y and get later re-injected into
InputDispatcher. The InputDispatcher will not resolve the correct
verifier, and as a result will incorrectly reject the event.

In this CL, we are storing the previous display id before
reconfiguration occurs, and then using this stored display id to abort
touches just before reset() is called.

In reset(), we are also canceling touches. That behaviour has to be
maintained, since reset() is a public API that can be called from other
places.

Bug: 378308551
Test: TEST=inputflinger_tests; m $TEST && $ANDROID_HOST_OUT/nativetest64/$TEST/$TEST --gtest_filter="*ChangeAssociatedDisplayIdWhenTouchIsActive*"
Flag: EXEMPT bugfix
Change-Id: I275bdd03929be6dd024c250c1276c05622a0e2ce
parent d1f56301

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+52 −42
Original line number Diff line number Diff line
@@ -302,6 +302,8 @@ std::list<NotifyArgs> TouchInputMapper::reconfigure(nsecs_t when, 
                                                    ConfigurationChanges changes) {

    std::list<NotifyArgs> out = InputMapper::reconfigure(when, config, changes);



    std::optional<ui::LogicalDisplayId> previousDisplayId = getAssociatedDisplayId();



    mConfig = config;



    // Full configuration should happen the first time configure is called and
@@ -350,6 +352,8 @@ std::list<NotifyArgs> TouchInputMapper::reconfigure(nsecs_t when, 
    }



    if (changes.any() && resetNeeded) {

        // Touches should be aborted using the previous display id, so that the stream is consistent

        out += abortTouches(when, when, /*policyFlags=*/0, previousDisplayId);

        out += reset(when);



        // Send reset, unless this is the first time the device has been configured,
@@ -1657,6 +1661,10 @@ bool TouchInputMapper::isTouchScreen() { 
            mParameters.hasAssociatedDisplay;

}



ui::LogicalDisplayId TouchInputMapper::resolveDisplayId() const {

    return getAssociatedDisplayId().value_or(ui::LogicalDisplayId::INVALID);

};



void TouchInputMapper::applyExternalStylusButtonState(nsecs_t when) {

    if (mDeviceMode == DeviceMode::DIRECT && hasExternalStylus()) {

        // If any of the external buttons are already pressed by the touch device, ignore them.
@@ -1928,8 +1936,9 @@ NotifyKeyArgs TouchInputMapper::dispatchVirtualKey(nsecs_t when, nsecs_t readTim 
                         keyEventFlags, keyCode, scanCode, metaState, downTime);

}



std::list<NotifyArgs> TouchInputMapper::abortTouches(nsecs_t when, nsecs_t readTime,

                                                     uint32_t policyFlags) {

std::list<NotifyArgs> TouchInputMapper::abortTouches(

        nsecs_t when, nsecs_t readTime, uint32_t policyFlags,

        std::optional<ui::LogicalDisplayId> currentGestureDisplayId) {

    std::list<NotifyArgs> out;

    if (mCurrentMotionAborted) {

        // Current motion event was already aborted.
@@ -1940,6 +1949,7 @@ std::list<NotifyArgs> TouchInputMapper::abortTouches(nsecs_t when, nsecs_t readT 
        int32_t metaState = getContext()->getGlobalMetaState();

        int32_t buttonState = mCurrentCookedState.buttonState;

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

                                     currentGestureDisplayId.value_or(resolveDisplayId()),

                                     AMOTION_EVENT_ACTION_CANCEL, 0, AMOTION_EVENT_FLAG_CANCELED,

                                     metaState, buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,

                                     mCurrentCookedState.cookedPointerData.pointerProperties,
@@ -1994,13 +2004,14 @@ std::list<NotifyArgs> TouchInputMapper::dispatchTouches(nsecs_t when, nsecs_t re 
        if (!currentIdBits.isEmpty()) {

            // No pointer id changes so this is a move event.

            // The listener takes care of batching moves so we don't have to deal with that here.

            out.push_back(

                    dispatchMotion(when, readTime, policyFlags, mSource, AMOTION_EVENT_ACTION_MOVE,

                                   0, 0, metaState, buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                         AMOTION_EVENT_ACTION_MOVE, 0, 0, metaState, buttonState,

                                         AMOTION_EVENT_EDGE_FLAG_NONE,

                                         mCurrentCookedState.cookedPointerData.pointerProperties,

                                         mCurrentCookedState.cookedPointerData.pointerCoords,

                                   mCurrentCookedState.cookedPointerData.idToIndex, currentIdBits,

                                   -1, mOrientedXPrecision, mOrientedYPrecision, mDownTime,

                                         mCurrentCookedState.cookedPointerData.idToIndex,

                                         currentIdBits, -1, mOrientedXPrecision,

                                         mOrientedYPrecision, mDownTime,

                                         MotionClassification::NONE));

        }

    } else {
@@ -2031,7 +2042,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchTouches(nsecs_t when, nsecs_t re 
            if (isCanceled) {

                ALOGI("Canceling pointer %d for the palm event was detected.", upId);

            }

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                         AMOTION_EVENT_ACTION_POINTER_UP, 0,

                                         isCanceled ? AMOTION_EVENT_FLAG_CANCELED : 0, metaState,

                                         buttonState, 0,
@@ -2050,7 +2061,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchTouches(nsecs_t when, nsecs_t re 
        // events, they do not generally handle them except when presented in a move event.

        if (moveNeeded && !moveIdBits.isEmpty()) {

            ALOG_ASSERT(moveIdBits.value == dispatchedIdBits.value);

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                         AMOTION_EVENT_ACTION_MOVE, 0, 0, metaState, buttonState, 0,

                                         mCurrentCookedState.cookedPointerData.pointerProperties,

                                         mCurrentCookedState.cookedPointerData.pointerCoords,
@@ -2071,7 +2082,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchTouches(nsecs_t when, nsecs_t re 
            }



            out.push_back(

                    dispatchMotion(when, readTime, policyFlags, mSource,

                    dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                   AMOTION_EVENT_ACTION_POINTER_DOWN, 0, 0, metaState, buttonState,

                                   0, mCurrentCookedState.cookedPointerData.pointerProperties,

                                   mCurrentCookedState.cookedPointerData.pointerCoords,
@@ -2090,7 +2101,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchHoverExit(nsecs_t when, nsecs_t 
        (mCurrentCookedState.cookedPointerData.hoveringIdBits.isEmpty() ||

         !mCurrentCookedState.cookedPointerData.touchingIdBits.isEmpty())) {

        int32_t metaState = getContext()->getGlobalMetaState();

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_HOVER_EXIT, 0, 0, metaState,

                                     mLastCookedState.buttonState, 0,

                                     mLastCookedState.cookedPointerData.pointerProperties,
@@ -2111,7 +2122,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchHoverEnterAndMove(nsecs_t when, 
        !mCurrentCookedState.cookedPointerData.hoveringIdBits.isEmpty()) {

        int32_t metaState = getContext()->getGlobalMetaState();

        if (!mSentHoverEnter) {

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                         AMOTION_EVENT_ACTION_HOVER_ENTER, 0, 0, metaState,

                                         mCurrentRawState.buttonState, 0,

                                         mCurrentCookedState.cookedPointerData.pointerProperties,
@@ -2123,7 +2134,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchHoverEnterAndMove(nsecs_t when, 
            mSentHoverEnter = true;

        }



        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_HOVER_MOVE, 0, 0, metaState,

                                     mCurrentRawState.buttonState, 0,

                                     mCurrentCookedState.cookedPointerData.pointerProperties,
@@ -2146,7 +2157,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchButtonRelease(nsecs_t when, nsec 
    while (!releasedButtons.isEmpty()) {

        int32_t actionButton = BitSet32::valueForBit(releasedButtons.clearFirstMarkedBit());

        buttonState &= ~actionButton;

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_BUTTON_RELEASE, actionButton, 0,

                                     metaState, buttonState, 0,

                                     mLastCookedState.cookedPointerData.pointerProperties,
@@ -2168,7 +2179,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchButtonPress(nsecs_t when, nsecs_ 
    while (!pressedButtons.isEmpty()) {

        int32_t actionButton = BitSet32::valueForBit(pressedButtons.clearFirstMarkedBit());

        buttonState |= actionButton;

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_BUTTON_PRESS, actionButton, 0, metaState,

                                     buttonState, 0,

                                     mCurrentCookedState.cookedPointerData.pointerProperties,
@@ -2192,7 +2203,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchGestureButtonRelease(nsecs_t whe 
    while (!releasedButtons.isEmpty()) {

        int32_t actionButton = BitSet32::valueForBit(releasedButtons.clearFirstMarkedBit());

        buttonState &= ~actionButton;

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_BUTTON_RELEASE, actionButton, 0,

                                     metaState, buttonState, 0,

                                     mPointerGesture.lastGestureProperties,
@@ -2216,7 +2227,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchGestureButtonPress(nsecs_t when, 
    while (!pressedButtons.isEmpty()) {

        int32_t actionButton = BitSet32::valueForBit(pressedButtons.clearFirstMarkedBit());

        buttonState |= actionButton;

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_BUTTON_PRESS, actionButton, 0, metaState,

                                     buttonState, 0, mPointerGesture.currentGestureProperties,

                                     mPointerGesture.currentGestureCoords,
@@ -2564,7 +2575,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchPointerGestures(nsecs_t when, ns 
    if (!dispatchedGestureIdBits.isEmpty()) {

        if (cancelPreviousGesture) {

            const uint32_t cancelFlags = flags | AMOTION_EVENT_FLAG_CANCELED;

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                         AMOTION_EVENT_ACTION_CANCEL, 0, cancelFlags, metaState,

                                         buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,

                                         mPointerGesture.lastGestureProperties,
@@ -2591,8 +2602,9 @@ std::list<NotifyArgs> TouchInputMapper::dispatchPointerGestures(nsecs_t when, ns 
                }

                const uint32_t id = upGestureIdBits.clearFirstMarkedBit();

                out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

                                             AMOTION_EVENT_ACTION_POINTER_UP, 0, flags, metaState,

                                             buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,

                                             resolveDisplayId(), AMOTION_EVENT_ACTION_POINTER_UP, 0,

                                             flags, metaState, buttonState,

                                             AMOTION_EVENT_EDGE_FLAG_NONE,

                                             mPointerGesture.lastGestureProperties,

                                             mPointerGesture.lastGestureCoords,

                                             mPointerGesture.lastGestureIdToIndex,
@@ -2606,13 +2618,14 @@ std::list<NotifyArgs> TouchInputMapper::dispatchPointerGestures(nsecs_t when, ns 


    // Send motion events for all pointers that moved.

    if (moveNeeded) {

        out.push_back(

                dispatchMotion(when, readTime, policyFlags, mSource, AMOTION_EVENT_ACTION_MOVE, 0,

                               flags, metaState, buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_MOVE, 0, flags, metaState, buttonState,

                                     AMOTION_EVENT_EDGE_FLAG_NONE,

                                     mPointerGesture.currentGestureProperties,

                                     mPointerGesture.currentGestureCoords,

                               mPointerGesture.currentGestureIdToIndex, dispatchedGestureIdBits, -1,

                               0, 0, mPointerGesture.downTime, classification));

                                     mPointerGesture.currentGestureIdToIndex,

                                     dispatchedGestureIdBits, -1, 0, 0, mPointerGesture.downTime,

                                     classification));

    }



    // Send motion events for all pointers that went down.
@@ -2627,7 +2640,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchPointerGestures(nsecs_t when, ns 
                mPointerGesture.downTime = when;

            }



            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

            out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                         AMOTION_EVENT_ACTION_POINTER_DOWN, 0, flags, metaState,

                                         buttonState, 0, mPointerGesture.currentGestureProperties,

                                         mPointerGesture.currentGestureCoords,
@@ -2645,7 +2658,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchPointerGestures(nsecs_t when, ns 


    // Send motion events for hover.

    if (mPointerGesture.currentGestureMode == PointerGesture::Mode::HOVER) {

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_HOVER_MOVE, 0, flags, metaState,

                                     buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,

                                     mPointerGesture.currentGestureProperties,
@@ -2704,7 +2717,7 @@ std::list<NotifyArgs> TouchInputMapper::abortPointerGestures(nsecs_t when, nsecs 
    if (!mPointerGesture.lastGestureIdBits.isEmpty()) {

        int32_t metaState = getContext()->getGlobalMetaState();

        int32_t buttonState = mCurrentRawState.buttonState;

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource,

        out.push_back(dispatchMotion(when, readTime, policyFlags, mSource, resolveDisplayId(),

                                     AMOTION_EVENT_ACTION_CANCEL, 0, AMOTION_EVENT_FLAG_CANCELED,

                                     metaState, buttonState, AMOTION_EVENT_EDGE_FLAG_NONE,

                                     mPointerGesture.lastGestureProperties,
@@ -3498,8 +3511,7 @@ std::list<NotifyArgs> TouchInputMapper::dispatchPointerMouse(nsecs_t when, nsecs 
        hovering = false;

    }



    return dispatchPointerSimple(when, readTime, policyFlags, down, hovering,

                                 getAssociatedDisplayId().value_or(ui::LogicalDisplayId::INVALID));

    return dispatchPointerSimple(when, readTime, policyFlags, down, hovering, resolveDisplayId());

}



std::list<NotifyArgs> TouchInputMapper::abortPointerMouse(nsecs_t when, nsecs_t readTime,
@@ -3662,9 +3674,10 @@ std::list<NotifyArgs> TouchInputMapper::abortPointerSimple(nsecs_t when, nsecs_t 
}



NotifyMotionArgs TouchInputMapper::dispatchMotion(

        nsecs_t when, nsecs_t readTime, uint32_t policyFlags, uint32_t source, int32_t action,

        int32_t actionButton, int32_t flags, int32_t metaState, int32_t buttonState,

        int32_t edgeFlags, const PropertiesArray& properties, const CoordsArray& coords,

        nsecs_t when, nsecs_t readTime, uint32_t policyFlags, uint32_t source,

        ui::LogicalDisplayId displayId, int32_t action, int32_t actionButton, int32_t flags,

        int32_t metaState, int32_t buttonState, int32_t edgeFlags,

        const PropertiesArray& properties, const CoordsArray& coords,

        const IdToIndexArray& idToIndex, BitSet32 idBits, int32_t changedId, float xPrecision,

        float yPrecision, nsecs_t downTime, MotionClassification classification) const {

    std::vector<PointerCoords> pointerCoords;
@@ -3714,9 +3727,6 @@ NotifyMotionArgs TouchInputMapper::dispatchMotion( 
        }

    }



    const ui::LogicalDisplayId displayId =

            getAssociatedDisplayId().value_or(ui::LogicalDisplayId::INVALID);



    float xCursorPosition = AMOTION_EVENT_INVALID_CURSOR_POSITION;

    float yCursorPosition = AMOTION_EVENT_INVALID_CURSOR_POSITION;

    if (mDeviceMode == DeviceMode::POINTER) {
@@ -3739,7 +3749,7 @@ NotifyMotionArgs TouchInputMapper::dispatchMotion( 
std::list<NotifyArgs> TouchInputMapper::cancelTouch(nsecs_t when, nsecs_t readTime) {

    std::list<NotifyArgs> out;

    out += abortPointerUsage(when, readTime, /*policyFlags=*/0);

    out += abortTouches(when, readTime, /* policyFlags=*/0);

    out += abortTouches(when, readTime, /* policyFlags=*/0, std::nullopt);

    return out;

}

services/inputflinger/reader/mapper/TouchInputMapper.h

+10 −6
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ protected: 
        // DeviceType::TOUCH_SCREEN, and will otherwise use DeviceType::POINTER by default.

        // This can be overridden by IDC files, using the `touch.deviceType` config.

        DeviceType deviceType;

        bool hasAssociatedDisplay;

        bool hasAssociatedDisplay = false;

        bool associatedDisplayIsExternal;

        bool orientationAware;
@@ -779,8 +779,9 @@ private: 
                                                                     nsecs_t readTime);

    const BitSet32& findActiveIdBits(const CookedPointerData& cookedPointerData);

    void cookPointerData();

    [[nodiscard]] std::list<NotifyArgs> abortTouches(nsecs_t when, nsecs_t readTime,

                                                     uint32_t policyFlags);

    [[nodiscard]] std::list<NotifyArgs> abortTouches(

            nsecs_t when, nsecs_t readTime, uint32_t policyFlags,

            std::optional<ui::LogicalDisplayId> gestureDisplayId);



    [[nodiscard]] std::list<NotifyArgs> dispatchPointerUsage(nsecs_t when, nsecs_t readTime,

                                                             uint32_t policyFlags,
@@ -836,15 +837,18 @@ private: 
    // method will take care of setting the index and transmuting the action to DOWN or UP

    // it is the first / last pointer to go down / up.

    [[nodiscard]] NotifyMotionArgs dispatchMotion(

            nsecs_t when, nsecs_t readTime, uint32_t policyFlags, uint32_t source, int32_t action,

            int32_t actionButton, int32_t flags, int32_t metaState, int32_t buttonState,

            int32_t edgeFlags, const PropertiesArray& properties, const CoordsArray& coords,

            nsecs_t when, nsecs_t readTime, uint32_t policyFlags, uint32_t source,

            ui::LogicalDisplayId displayId, int32_t action, int32_t actionButton, int32_t flags,

            int32_t metaState, int32_t buttonState, int32_t edgeFlags,

            const PropertiesArray& properties, const CoordsArray& coords,

            const IdToIndexArray& idToIndex, BitSet32 idBits, int32_t changedId, float xPrecision,

            float yPrecision, nsecs_t downTime, MotionClassification classification) const;



    // Returns if this touch device is a touch screen with an associated display.

    bool isTouchScreen();



    ui::LogicalDisplayId resolveDisplayId() const;



    bool isPointInsidePhysicalFrame(int32_t x, int32_t y) const;

    const VirtualKey* findVirtualKeyHit(int32_t x, int32_t y);

services/inputflinger/tests/MultiTouchInputMapper_test.cpp

+97 −13

File changed.

Preview size limit exceeded, changes collapsed.