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

Commit 509f6297 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "inputflinger: remove edge flags from NotifyMotionArgs constructor" into main

parents a83d862d 44fd292d

services/inputflinger/NotifyArgs.cpp

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ NotifyMotionArgs::NotifyMotionArgs( 
        int32_t id, nsecs_t eventTime, nsecs_t readTime, int32_t deviceId, uint32_t source,

        ui::LogicalDisplayId displayId, uint32_t policyFlags, int32_t action, int32_t actionButton,

        int32_t flags, int32_t metaState, int32_t buttonState, MotionClassification classification,

        int32_t edgeFlags, uint32_t pointerCount, const PointerProperties* pointerProperties,

        uint32_t pointerCount, const PointerProperties* pointerProperties,

        const PointerCoords* pointerCoords, float xPrecision, float yPrecision,

        float xCursorPosition, float yCursorPosition, nsecs_t downTime,

        const std::vector<TouchVideoFrame>& videoFrames)
@@ -77,7 +77,7 @@ NotifyMotionArgs::NotifyMotionArgs( 
        metaState(metaState),

        buttonState(buttonState),

        classification(classification),

        edgeFlags(edgeFlags),

        edgeFlags(AMOTION_EVENT_EDGE_FLAG_NONE),

        xPrecision(xPrecision),

        yPrecision(yPrecision),

        xCursorPosition(xCursorPosition),

services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp

+1 −2
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ static NotifyMotionArgs generateMotionArgs() { 
                          DEVICE_ID, AINPUT_SOURCE_TOUCHSCREEN, ui::LogicalDisplayId::DEFAULT,

                          POLICY_FLAG_PASS_TO_USER, AMOTION_EVENT_ACTION_DOWN,

                          /* actionButton */ 0, /* flags */ 0, AMETA_NONE, /* buttonState */ 0,

                          MotionClassification::NONE, AMOTION_EVENT_EDGE_FLAG_NONE, 1,

                          pointerProperties, pointerCoords,

                          MotionClassification::NONE, 1, pointerProperties, pointerCoords,

                          /* xPrecision */ 0, /* yPrecision */ 0,

                          AMOTION_EVENT_INVALID_CURSOR_POSITION,

                          AMOTION_EVENT_INVALID_CURSOR_POSITION, currentTime, /* videoFrames */ {});

services/inputflinger/include/NotifyArgs.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ struct NotifyMotionArgs { 
    NotifyMotionArgs(int32_t id, nsecs_t eventTime, nsecs_t readTime, int32_t deviceId,

                     uint32_t source, ui::LogicalDisplayId displayId, uint32_t policyFlags,

                     int32_t action, int32_t actionButton, int32_t flags, int32_t metaState,

                     int32_t buttonState, MotionClassification classification, int32_t edgeFlags,

                     int32_t buttonState, MotionClassification classification,

                     uint32_t pointerCount, const PointerProperties* pointerProperties,

                     const PointerCoords* pointerCoords, float xPrecision, float yPrecision,

                     float xCursorPosition, float yCursorPosition, nsecs_t downTime,

services/inputflinger/include/NotifyArgsBuilders.h

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ public: 
                AMETA_NONE,

                mButtonState,

                mClassification,

                /*edgeFlags=*/0,

                static_cast<uint32_t>(mPointers.size()),

                pointerProperties.data(),

                pointerCoords.data(),

services/inputflinger/reader/mapper/CapturedTouchpadEventConverter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ NotifyMotionArgs CapturedTouchpadEventConverter::makeMotionArgs( 
                            ui::LogicalDisplayId::INVALID, /*policyFlags=*/POLICY_FLAG_WAKE, action,

                            /*actionButton=*/actionButton, flags,

                            mReaderContext.getGlobalMetaState(), mButtonState,

                            MotionClassification::NONE, AMOTION_EVENT_EDGE_FLAG_NONE, coords.size(),

                            properties.data(), coords.data(), /*xPrecision=*/1.0f,

                            MotionClassification::NONE, coords.size(), properties.data(),

                            coords.data(), /*xPrecision=*/1.0f,

                            /*yPrecision=*/1.0f, AMOTION_EVENT_INVALID_CURSOR_POSITION,

                            AMOTION_EVENT_INVALID_CURSOR_POSITION, mDownTime, /*videoFrames=*/{});

}