summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 86eafe60b62c..30bce2f41cf7 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3971,7 +3971,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
return true;
case KeyEvent.KEYCODE_ESCAPE:
- if (down && repeatCount == 0) {
+ if (down
+ && KeyEvent.metaStateHasNoModifiers(metaState)
+ && repeatCount == 0) {
mContext.closeSystemDialogs();
}
return true;