summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-08-22 15:40:27 -0700
committerMichael Wright <michaelwr@google.com>2014-08-22 15:40:27 -0700
commit251e35da76ceefb926bd171d2e369aafe6974d1a (patch)
tree69ab5acb5644bcb9c1aba100f9f5870abc3e5bba
parent7653a30ea0232ab8323ec51ddcba8d8054ca8a2f (diff)
downloadframeworks_base-251e35da76ceefb926bd171d2e369aafe6974d1a.zip
frameworks_base-251e35da76ceefb926bd171d2e369aafe6974d1a.tar.gz
frameworks_base-251e35da76ceefb926bd171d2e369aafe6974d1a.tar.bz2
Cancel pending meta actions when the key pressed *isn't* meta.
Bug: 17207035 Change-Id: I980107a453814e4e34e32db338620e90d3b388ee
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 9e268c3..ba0d985 100644
--- 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;
}