Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 615f7eb7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change the type of displayId to int32_t" into main am: c2d55d91 am: 9b5668b9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3019024



Change-Id: I5acc79d94a26185aca31b6c713e95e5dbf1d819a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1333fb91 9b5668b9

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4848,7 +4848,7 @@ InputEventInjectionResult InputDispatcher::injectInputEvent(const InputEvent* ev 
            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();