commit 2b80b386c4ed5a1b3240da32080280b0a1ec9cef
author Jay Wang <jaytwang@google.com> Fri Nov 19 17:26:26 2021 +0000
committer Jay Wang <jaytwang@google.com> Sat Nov 20 00:40:38 2021 +0000
tree 724c88da6281ceb4225f8105bc14e56b0d591464
parent 5e6b390919a9786a50f9d5cbd539e9dc53ad78c2

Revert "Remove x/y offset from MotionEntry"

Revert submission 16295572

Reason for revert: DroidMonitor-triggered revert due to breakage bug http://b/207128427.
BUG: 207128427

Reverted Changes:
I65c284e5e:Input injection: Assume transformed values are in ...
Ifd359ebb0:Remove x/y offset from MotionEntry

Change-Id: Iab395d41d49db17c0a682bdd6c77fe2aacc004f4

services/inputflinger/dispatcher/InputState.cpp

diff --git a/services/inputflinger/dispatcher/InputState.cpp b/services/inputflinger/dispatcher/InputState.cpp
index ad3c615..3bb0bc9 100644
--- a/services/inputflinger/dispatcher/InputState.cpp
+++ b/services/inputflinger/dispatcher/InputState.cpp
@@ -296,7 +296,8 @@
                                                   memento.yPrecision, memento.xCursorPosition,
                                                   memento.yCursorPosition, memento.downTime,
                                                   memento.pointerCount, memento.pointerProperties,
-                                                  memento.pointerCoords));
+                                                  memento.pointerCoords, 0 /*xOffset*/,
+                                                  0 /*yOffset*/));
         }
     }
     return events;
@@ -348,7 +349,8 @@
                                                   AMOTION_EVENT_EDGE_FLAG_NONE, memento.xPrecision,
                                                   memento.yPrecision, memento.xCursorPosition,
                                                   memento.yCursorPosition, memento.downTime,
-                                                  pointerCount, pointerProperties, pointerCoords));
+                                                  pointerCount, pointerProperties, pointerCoords,
+                                                  0 /*xOffset*/, 0 /*yOffset*/));
         }
 
         memento.firstNewPointerIdx = INVALID_POINTER_INDEX;