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/Entry.cpp

diff --git a/services/inputflinger/dispatcher/Entry.cpp b/services/inputflinger/dispatcher/Entry.cpp
index 3d0818b..1674afd 100644
--- a/services/inputflinger/dispatcher/Entry.cpp
+++ b/services/inputflinger/dispatcher/Entry.cpp
@@ -214,7 +214,7 @@
                          int32_t edgeFlags, float xPrecision, float yPrecision,
                          float xCursorPosition, float yCursorPosition, nsecs_t downTime,
                          uint32_t pointerCount, const PointerProperties* pointerProperties,
-                         const PointerCoords* pointerCoords)
+                         const PointerCoords* pointerCoords, float xOffset, float yOffset)
       : EventEntry(id, Type::MOTION, eventTime, policyFlags),
         deviceId(deviceId),
         source(source),
@@ -235,6 +235,9 @@
     for (uint32_t i = 0; i < pointerCount; i++) {
         this->pointerProperties[i].copyFrom(pointerProperties[i]);
         this->pointerCoords[i].copyFrom(pointerCoords[i]);
+        if (xOffset || yOffset) {
+            this->pointerCoords[i].applyOffset(xOffset, yOffset);
+        }
     }
 }