commit b1462ec353d70a2a80ac6799c390ac6d11d70cba
author arthurhung <arthurhung@google.com> Mon Apr 20 17:18:37 2020 +0800
committer arthurhung <arthurhung@google.com> Mon Apr 20 17:23:23 2020 +0800
tree 90c6a563c152ba362b548d185df704af49c68cca
parent 0a3da7b79d2aa4c31b3dfa08867a850dbffad9e5

Fix KeyEventInterceptTest fail

The meta shortcuts may be detected by InputDispatcher and it potentially
overwrite the keyCode and metaState. We should pass the overrided values
instead of the original one.

Test: atest KeyEventInterceptTest
Bug: 153606162
Change-Id: Ia7938c30eccf74785d03c72e8b308fd92cf96efb

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;