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

Commit b48be8a5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 037b54cf to master"

parents 01defe40 2ba3e80f

services/input/InputDispatcher.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2027,6 +2027,14 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, 
            // Append additional motion samples.

            MotionSample* nextMotionSample = firstMotionSample->next;

            for (; nextMotionSample != NULL; nextMotionSample = nextMotionSample->next) {

                if ((motionEntry->source & AINPUT_SOURCE_CLASS_POINTER) != 0 && scaleFactor != 1.0f) {

                    for (size_t i = 0; i < motionEntry->pointerCount; i++) {

                        scaledCoords[i] = nextMotionSample->pointerCoords[i];

                        scaledCoords[i].scale(scaleFactor);

                    }

                } else {

                    usingCoords = nextMotionSample->pointerCoords;

                }

                status = connection->inputPublisher.appendMotionSample(

                        nextMotionSample->eventTime, usingCoords);

                if (status == NO_MEMORY) {