commit b4e0a59973efabf4f9ce93bffec24a552fb91361
author Sean Stout <sstout@google.com> Tue Feb 23 07:34:53 2021 -0800
committer Sean Stout <sstout@google.com> Tue Feb 23 21:52:32 2021 -0800
tree a9154d1f410683ba6920603fc631dc20d6456744
parent 44e9f3b54d71a0b71d10918047163fd11bebfdf8

Include display ID in user activity reporting

When reporting user activity, include the display ID that was interacted
with. This will facilitate supporting per-DisplayGroup timeout behavior.

Bug: 175764389
Test: manual - ensure display ID is sent correctly
Change-Id: I4b9e615cbda06e8c8b26a88a5193563ab3739148

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 9898e9d..d0a5c09 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -2591,6 +2591,7 @@
             std::make_unique<CommandEntry>(&InputDispatcher::doPokeUserActivityLockedInterruptible);
     commandEntry->eventTime = eventEntry.eventTime;
     commandEntry->userActivityEventType = eventType;
+    commandEntry->displayId = displayId;
     postCommandLocked(std::move(commandEntry));
 }
 
@@ -5715,7 +5716,8 @@
 void InputDispatcher::doPokeUserActivityLockedInterruptible(CommandEntry* commandEntry) {
     mLock.unlock();
 
-    mPolicy->pokeUserActivity(commandEntry->eventTime, commandEntry->userActivityEventType);
+    mPolicy->pokeUserActivity(commandEntry->eventTime, commandEntry->userActivityEventType,
+                              commandEntry->displayId);
 
     mLock.lock();
 }