commit e23a168dd4669f7bbee82f4906480cc797f94fa1
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 21 03:38:55 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 21 03:38:55 2022 +0000
tree a2af39b810c84d2768a65cd4017a122ac292d7e3
parent 15a5c5afa02710d4c5f33056fc94008def08bb57
parent d9a2ebe919abe9bf10f985bd57cb5a80be693c6f

Merge "Transform injected cursor positions" into tm-qpr-dev

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 5e9427a..dfb770a 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -4470,6 +4470,14 @@
     if (it == mDisplayInfos.end()) return;
     const auto& transformToDisplay = it->second.transform.inverse() * injectedTransform;
 
+    if (entry.xCursorPosition != AMOTION_EVENT_INVALID_CURSOR_POSITION &&
+        entry.yCursorPosition != AMOTION_EVENT_INVALID_CURSOR_POSITION) {
+        const vec2 cursor =
+                MotionEvent::calculateTransformedXY(entry.source, transformToDisplay,
+                                                    {entry.xCursorPosition, entry.yCursorPosition});
+        entry.xCursorPosition = cursor.x;
+        entry.yCursorPosition = cursor.y;
+    }
     for (uint32_t i = 0; i < entry.pointerCount; i++) {
         entry.pointerCoords[i] =
                 MotionEvent::calculateTransformedCoords(entry.source, transformToDisplay,