commit 933a6bfdb7d5d77cfda1e4646cf9a3a985d4e562
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 10 19:20:42 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 10 19:20:42 2022 +0000
tree 2165e618b1aa455be1534a4a1d7e046a746c30a2
parent 12417baa665898b114a346f11c81cd526baa505a
parent b8fd3ef57dd02e0f9c171c3ba9775ca781cd5527

Merge "Delete struct PointerData to fix ODR violation"

services/inputflinger/tests/PreferStylusOverTouch_test.cpp

diff --git a/services/inputflinger/tests/PreferStylusOverTouch_test.cpp b/services/inputflinger/tests/PreferStylusOverTouch_test.cpp
index 8e2ab88..bd05360 100644
--- a/services/inputflinger/tests/PreferStylusOverTouch_test.cpp
+++ b/services/inputflinger/tests/PreferStylusOverTouch_test.cpp
@@ -33,14 +33,8 @@
 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";