From a50984c3582e9c7b35cd50c7c30187bff3c0c414 Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Thu, 26 Aug 2021 12:27:32 -0700
Subject: [PATCH] Add display transform to MotionEvent for raw coords

Bug: 179274888
Test: presubmit
Test: manual, ensure input works

Change-Id: I8b2d4cdfb954b86b7dad8307d75be0e6d2fe3fe6
---
 core/jni/android_view_InputEventSender.cpp | 4 +---
 core/jni/android_view_MotionEvent.cpp      | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp
index 16366a4e5bec3..5da273896e296 100644
--- a/core/jni/android_view_InputEventSender.cpp
+++ b/core/jni/android_view_InputEventSender.cpp
@@ -155,9 +155,7 @@ status_t NativeInputEventSender::sendMotionEvent(uint32_t seq, const MotionEvent
                                                    event->getYPrecision(),
                                                    event->getRawXCursorPosition(),
                                                    event->getRawYCursorPosition(),
-                                                   event->getDisplayOrientation(),
-                                                   event->getDisplaySize().x,
-                                                   event->getDisplaySize().y, event->getDownTime(),
+                                                   event->getRawTransform(), event->getDownTime(),
                                                    event->getHistoricalEventTime(i),
                                                    event->getPointerCount(),
                                                    event->getPointerProperties(),
diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp
index cabf3abe350a2..efd0547c559ba 100644
--- a/core/jni/android_view_MotionEvent.cpp
+++ b/core/jni/android_view_MotionEvent.cpp
@@ -393,13 +393,13 @@ static jlong android_view_MotionEvent_nativeInitialize(
 
     ui::Transform transform;
     transform.set(xOffset, yOffset);
+    ui::Transform identityTransform;
     event->initialize(InputEvent::nextId(), deviceId, source, displayId, INVALID_HMAC, action, 0,
                       flags, edgeFlags, metaState, buttonState,
                       static_cast<MotionClassification>(classification), transform, xPrecision,
                       yPrecision, AMOTION_EVENT_INVALID_CURSOR_POSITION,
-                      AMOTION_EVENT_INVALID_CURSOR_POSITION, ui::Transform::ROT_0,
-                      INVALID_DISPLAY_SIZE, INVALID_DISPLAY_SIZE, downTimeNanos, eventTimeNanos,
-                      pointerCount, pointerProperties, rawPointerCoords);
+                      AMOTION_EVENT_INVALID_CURSOR_POSITION, identityTransform, downTimeNanos,
+                      eventTimeNanos, pointerCount, pointerProperties, rawPointerCoords);
 
     return reinterpret_cast<jlong>(event.release());
 }