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

Commit d9a2ebe9 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Transform injected cursor positions 

Events are injected in the logical display space, and must be
transformed back to (unrotated) display space for dispatching. In this
CL, we transform the cursor position too, as this was not previously
being transformed before.

Bug: 236558840
Test: atest android.view.cts.TooltipTest#testMouseHoverTooltipOnLongClickableView
Change-Id: Id59b0a6f596d1822f1786d806488e07f86c1b71b
parent 63d2834f

services/inputflinger/dispatcher/InputDispatcher.cpp

+8 −0
Original line number Diff line number Diff line
@@ -4470,6 +4470,14 @@ void InputDispatcher::transformMotionEntryForInjectionLocked( 
    if (it == mDisplayInfos.end()) return;

    const auto& transformToDisplay = it->second.transform.inverse() * injectedTransform;



    if (entry.xCursorPosition != AMOTION_EVENT_INVALID_CURSOR_POSITION &&

        entry.yCursorPosition != AMOTION_EVENT_INVALID_CURSOR_POSITION) {

        const vec2 cursor =

                MotionEvent::calculateTransformedXY(entry.source, transformToDisplay,

                                                    {entry.xCursorPosition, entry.yCursorPosition});

        entry.xCursorPosition = cursor.x;

        entry.yCursorPosition = cursor.y;

    }

    for (uint32_t i = 0; i < entry.pointerCount; i++) {

        entry.pointerCoords[i] =

                MotionEvent::calculateTransformedCoords(entry.source, transformToDisplay,