commit dea4ecc800e3e88eb8c1fe0b17897c03223b56e6
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 30 13:10:59 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 30 13:10:59 2023 +0000
tree f27089f24eea04f90bf8950def696c27e09575eb
parent 510f224fa06159148cf05754640f4dc6ce825975
parent 99a9db09d4f48b6b4f595c807e59c1ce6dd3ffca

Merge "Correct the spelling of words"

common/device-side/util-axt/src/com/android/compatibility/common/util/CtsMouseUtil.java

diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/CtsMouseUtil.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/CtsMouseUtil.java
index e53eb08..5cabd64 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/CtsMouseUtil.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/CtsMouseUtil.java
@@ -126,8 +126,8 @@
         @Override
         public boolean matches(MotionEvent actual) {
             return super.matches(actual)
-                    && ((int) actual.getX()) == mX
-                    && ((int) actual.getY()) == mY;
+                    && Math.round(actual.getX()) == mX
+                    && Math.round(actual.getY()) == mY;
         }
 
         @Override

tests/tests/view/src/android/view/cts/ViewUnbufferedTest.java

diff --git a/tests/tests/view/src/android/view/cts/ViewUnbufferedTest.java b/tests/tests/view/src/android/view/cts/ViewUnbufferedTest.java
index 68c4a77..20f7283 100644
--- a/tests/tests/view/src/android/view/cts/ViewUnbufferedTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewUnbufferedTest.java
@@ -246,7 +246,7 @@
         }
 
         mReceivedEvents.add(new ReceivedEvent(event.getEventTime(), event.getAction(),
-                (int) event.getX(), (int) event.getY(), event.getSource()));
+                Math.round(event.getX()), Math.round(event.getY()), event.getSource()));
 
         // Always return true to make sure the event has been handled.
         return true;