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

Commit 4bbb4ab6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use consistent coordinate extraction code in dispatcher"

parents 010d82c7 9306c387

services/inputflinger/dispatcher/InputDispatcher.cpp

+4 −9
Original line number Original line Diff line number Diff line
@@ -936,13 +936,10 @@ bool InputDispatcher::shouldPruneInboundQueueLocked(const MotionEntry& motionEnt 
    // If the application takes too long to catch up then we drop all events preceding

    // If the application takes too long to catch up then we drop all events preceding

    // the touch into the other window.

    // the touch into the other window.

    if (isPointerDownEvent && mAwaitedFocusedApplication != nullptr) {

    if (isPointerDownEvent && mAwaitedFocusedApplication != nullptr) {

        int32_t displayId = motionEntry.displayId;

        const int32_t displayId = motionEntry.displayId;

        int32_t x = static_cast<int32_t>(

        const auto [x, y] = resolveTouchedPosition(motionEntry);

                motionEntry.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_X));

        int32_t y = static_cast<int32_t>(

                motionEntry.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_Y));



        const bool isStylus = isPointerFromStylus(motionEntry, 0 /*pointerIndex*/);

        const bool isStylus = isPointerFromStylus(motionEntry, 0 /*pointerIndex*/);



        sp<WindowInfoHandle> touchedWindowHandle =

        sp<WindowInfoHandle> touchedWindowHandle =

                findTouchedWindowAtLocked(displayId, x, y, nullptr, isStylus);

                findTouchedWindowAtLocked(displayId, x, y, nullptr, isStylus);

        if (touchedWindowHandle != nullptr &&

        if (touchedWindowHandle != nullptr &&
@@ -2202,9 +2199,7 @@ InputEventInjectionResult InputDispatcher::findTouchedWindowTargetsLocked( 
        // Check whether touches should slip outside of the current foreground window.

        // Check whether touches should slip outside of the current foreground window.

        if (maskedAction == AMOTION_EVENT_ACTION_MOVE && entry.pointerCount == 1 &&

        if (maskedAction == AMOTION_EVENT_ACTION_MOVE && entry.pointerCount == 1 &&

            tempTouchState.isSlippery()) {

            tempTouchState.isSlippery()) {

            const int32_t x = int32_t(entry.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_X));

            const auto [x, y] = resolveTouchedPosition(entry);

            const int32_t y = int32_t(entry.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_Y));



            const bool isStylus = isPointerFromStylus(entry, 0 /*pointerIndex*/);

            const bool isStylus = isPointerFromStylus(entry, 0 /*pointerIndex*/);

            sp<WindowInfoHandle> oldTouchedWindowHandle =

            sp<WindowInfoHandle> oldTouchedWindowHandle =

                    tempTouchState.getFirstForegroundWindowHandle();

                    tempTouchState.getFirstForegroundWindowHandle();