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

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

Merge "Delete struct PointerData to fix ODR violation"

parents 12417baa b8fd3ef5

services/inputflinger/tests/PreferStylusOverTouch_test.cpp

+1 −7
Original line number Diff line number Diff line
@@ -33,14 +33,8 @@ static constexpr int32_t POINTER_1_DOWN = 
constexpr int32_t TOUCHSCREEN = AINPUT_SOURCE_TOUCHSCREEN;

constexpr int32_t STYLUS = AINPUT_SOURCE_STYLUS;



struct PointerData {

    float x;

    float y;

};



static NotifyMotionArgs generateMotionArgs(nsecs_t downTime, nsecs_t eventTime, int32_t action,

                                           const std::vector<PointerData>& points,

                                           uint32_t source) {

                                           const std::vector<Point>& points, uint32_t source) {

    size_t pointerCount = points.size();

    if (action == DOWN || action == UP) {

        EXPECT_EQ(1U, pointerCount) << "Actions DOWN and UP can only contain a single pointer";