commit 9ad01462a742d3b44fd4258bc794f99b130ef73a
author Vishnu Nair <vishnun@google.com> Fri Jan 15 12:55:14 2021 -0800
committer Vishnu Nair <vishnun@google.com> Fri Jan 15 13:53:19 2021 -0800
tree e1ec004fef1069cb8fc14beb5215d1a542c36b43
parent 88ce0fa5e59d2b19ece38708672baebbc4a19bc0

Pass in window name along with focus request

Used for generating focus event logs and debug
logs.

Test: go/wm-smoke, check event logs and logcat

Change-Id: I7d96c706ea350ec122c254fb4c327756e8267df5

libs/gui/tests/EndToEndNativeInputTest.cpp

diff --git a/libs/gui/tests/EndToEndNativeInputTest.cpp b/libs/gui/tests/EndToEndNativeInputTest.cpp
index 3965ea0..31cbbdc 100644
--- a/libs/gui/tests/EndToEndNativeInputTest.cpp
+++ b/libs/gui/tests/EndToEndNativeInputTest.cpp
@@ -202,8 +202,14 @@
 
     void requestFocus() {
         SurfaceComposerClient::Transaction t;
-        t.setFocusedWindow(mInputInfo.token, nullptr, systemTime(SYSTEM_TIME_MONOTONIC),
-                           0 /* displayId */);
+        FocusRequest request;
+        request.token = mInputInfo.token;
+        request.windowName = mInputInfo.name;
+        request.focusedToken = nullptr;
+        request.focusedWindowName = "";
+        request.timestamp = systemTime(SYSTEM_TIME_MONOTONIC);
+        request.displayId = 0;
+        t.setFocusedWindow(request);
         t.apply(true);
     }