diff options
| author | Adam Powell <adamp@google.com> | 2011-08-17 16:53:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-17 16:53:03 -0700 |
| commit | 926808dc9bd99e3d663d1612961f587db6161ad5 (patch) | |
| tree | 2950dcfa43b5c44fd575ccd9145ccbde09cf8fa5 /policy/src | |
| parent | c395530de8d91e301460e0bc16e70696043049e3 (diff) | |
| parent | 012da5a27fc669defdc616d74172caf22540d55e (diff) | |
| download | frameworks_base-926808dc9bd99e3d663d1612961f587db6161ad5.zip frameworks_base-926808dc9bd99e3d663d1612961f587db6161ad5.tar.gz frameworks_base-926808dc9bd99e3d663d1612961f587db6161ad5.tar.bz2 | |
Merge "Fix bug 533274 - Menu key opens wrong menu in action mode"
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 1791e40..73e4338 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -759,7 +759,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (mPanelChordingKey != 0) { mPanelChordingKey = 0; - if (event.isCanceled()) { + if (event.isCanceled() || (mDecor != null && mDecor.mActionMode != null)) { return; } |