commit c2d55d916ac53d2f1ab62c0e5b80a060508ea0e6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 28 21:28:30 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 28 21:28:30 2024 +0000
tree c0aeb4f8f8df94291f621879e12cc14eac42312a
parent b95bd3bfe6e09af2fbab870403a2c5c964c9559f
parent 43654e701c8ab7ef0fa64d31375e053e3012fab7

Merge "Change the type of displayId to int32_t" into main

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 9a3fe43..67e48a2 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -4680,7 +4680,7 @@
             const bool isPointerEvent =
                     isFromSource(event->getSource(), AINPUT_SOURCE_CLASS_POINTER);
             // If a pointer event has no displayId specified, inject it to the default display.
-            const uint32_t displayId = isPointerEvent && (event->getDisplayId() == ADISPLAY_ID_NONE)
+            const int32_t displayId = isPointerEvent && (event->getDisplayId() == ADISPLAY_ID_NONE)
                     ? ADISPLAY_ID_DEFAULT
                     : event->getDisplayId();
             int32_t flags = motionEvent.getFlags();