diff options
| author | Tarandeep Singh <tarandeep@google.com> | 2017-07-31 10:51:54 -0700 |
|---|---|---|
| committer | Tarandeep Singh <tarandeep@google.com> | 2017-08-01 13:36:10 -0700 |
| commit | 58641508af4e3d3f553ff7e73304866755cfbd5b (patch) | |
| tree | bd7055925d0277f05b1dc723e24f7343e8f5638b /services | |
| parent | 48aeb512e9c9492cb7b5ccf642795af7b4b97cd6 (diff) | |
| download | native-58641508af4e3d3f553ff7e73304866755cfbd5b.tar.gz | |
Add displayId in InputDispatcher, InputTransport
Bug: 62033391
Test: make StructLayout_test
make libinput_tests_InputEvent_test
make libinput_tests_InputPublisherAndConsumer_test
Run tests under /data/nativetest64/libinput_tests/
Change-Id: Id02cab83924d399eae0c1c233dc545fbb64945c2
Diffstat (limited to 'services')
| -rw-r--r-- | services/inputflinger/InputDispatcher.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index 7bc702d00f..69067d225b 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -2023,7 +2023,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, // Publish the motion event. status = connection->inputPublisher.publishMotionEvent(dispatchEntry->seq, - motionEntry->deviceId, motionEntry->source, + motionEntry->deviceId, motionEntry->source, motionEntry->displayId, dispatchEntry->resolvedAction, motionEntry->actionButton, dispatchEntry->resolvedFlags, motionEntry->edgeFlags, motionEntry->metaState, motionEntry->buttonState, @@ -2597,8 +2597,9 @@ int32_t InputDispatcher::injectInputEvent(const InputEvent* event, int32_t displ uint32_t policyFlags) { #if DEBUG_INBOUND_EVENT_DETAILS ALOGD("injectInputEvent - eventType=%d, injectorPid=%d, injectorUid=%d, " - "syncMode=%d, timeoutMillis=%d, policyFlags=0x%08x", - event->getType(), injectorPid, injectorUid, syncMode, timeoutMillis, policyFlags); + "syncMode=%d, timeoutMillis=%d, policyFlags=0x%08x, displayId=%d", + event->getType(), injectorPid, injectorUid, syncMode, timeoutMillis, policyFlags, + displayId); #endif nsecs_t endTime = now() + milliseconds_to_nanoseconds(timeoutMillis); |