commit 9bb3ef2e78879e4ec02821fbdb07ba9f9e9521a1
author Jeff Brown <jeffbrown@google.com> Wed Nov 17 19:16:52 2010 -0800
committer Jeff Brown <jeffbrown@google.com> Wed Nov 17 19:17:54 2010 -0800
tree e23887aff5db012d2aea4f31dbd1143ff9fa6d99
parent bc2e494938131f0aec2f3cebf92d30734224343b

Fix stuck keys when released out of order. (DO NOT MERGE)

Bug: 3208156
Change-Id: I14e4d54f4912de5e2fabcd8638120623aa2d16e0

libs/ui/InputReader.cpp

diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp
index d167439..3197ab2 100644
--- a/libs/ui/InputReader.cpp
+++ b/libs/ui/InputReader.cpp
@@ -934,7 +934,7 @@
             ssize_t keyDownIndex = findKeyDownLocked(scanCode);
             if (keyDownIndex >= 0) {
                 // key repeat, be sure to use same keycode as before in case of rotation
-                keyCode = mLocked.keyDowns.top().keyCode;
+                keyCode = mLocked.keyDowns.itemAt(keyDownIndex).keyCode;
             } else {
                 // key down
                 mLocked.keyDowns.push();
@@ -949,7 +949,7 @@
             ssize_t keyDownIndex = findKeyDownLocked(scanCode);
             if (keyDownIndex >= 0) {
                 // key up, be sure to use same keycode as before in case of rotation
-                keyCode = mLocked.keyDowns.top().keyCode;
+                keyCode = mLocked.keyDowns.itemAt(keyDownIndex).keyCode;
                 mLocked.keyDowns.removeAt(size_t(keyDownIndex));
             } else {
                 // key was not actually down