| commit | f5ee90997ccd634b7fb28ccd1e00d3b631d9b1d1 | [log] [tgz] |
|---|---|---|
| author | Josep del Río <joseprio@google.com> | Wed Nov 29 19:16:05 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 29 19:16:05 2023 +0000 |
| tree | f6cbc8f02b6177cd77c21cc37c6bb77261c6e2a6 | |
| parent | 63c9ac69eceb1a4936d96d94bc7bb5b6beeea69a [diff] | |
| parent | ecde0cff345434c5b968262c585d10e8d838be41 [diff] |
Merge "Do not intercept Escape with modifiers" into main
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 86eafe6..30bce2f4 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 @@ } return true; case KeyEvent.KEYCODE_ESCAPE: - if (down && repeatCount == 0) { + if (down + && KeyEvent.metaStateHasNoModifiers(metaState) + && repeatCount == 0) { mContext.closeSystemDialogs(); } return true;