Merge "Cancel pending meta actions when the key pressed *isn't* meta." into lmp-dev

2014-08-25 17:23:25 +00:00
parent 4b4d7efe52 251e35da76
commit 0e47941d5e
1 changed files with 1 additions and 1 deletions
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2176,7 +2176,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

        // Cancel any pending meta actions if we see any other keys being pressed between the down
        // of the meta key and its corresponding up.
-        if (mPendingMetaAction && KeyEvent.isMetaKey(keyCode)) {
+        if (mPendingMetaAction && !KeyEvent.isMetaKey(keyCode)) {
            mPendingMetaAction = false;
        }