commit 47fe955271cb533b9c7f10018efcd9bb717c9534
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 21 11:32:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 11:32:04 2020 +0000
tree 1d9ab89681b828af8012259b6a70682384f4e0b2
parent b1ffebea2a160dd159e6f8108ae64c2ce49af34c
parent 373272952dcef374e8bc284e01345d1e3c913a88

Merge "Fix KeyEventInterceptTest fail" into rvc-dev am: c41bb27e88 am: 373272952d

Change-Id: I5b67d6c1e9d7698232729a1ece66469373699408

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 403e21d..6a45d58 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -3280,9 +3280,8 @@
             KeyEntry* injectedEntry =
                     new KeyEntry(incomingKey.getId(), incomingKey.getEventTime(),
                                  VIRTUAL_KEYBOARD_ID, incomingKey.getSource(),
-                                 incomingKey.getDisplayId(), policyFlags, action, flags,
-                                 incomingKey.getKeyCode(), incomingKey.getScanCode(),
-                                 incomingKey.getMetaState(), incomingKey.getRepeatCount(),
+                                 incomingKey.getDisplayId(), policyFlags, action, flags, keyCode,
+                                 incomingKey.getScanCode(), metaState, incomingKey.getRepeatCount(),
                                  incomingKey.getDownTime());
             injectedEntries.push(injectedEntry);
             break;