diff options
| author | Jose Lima <joselima@google.com> | 2015-01-28 20:55:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-28 20:55:52 +0000 |
| commit | 1f81973e7d33f2a3f4b0a0e232854283f0f18030 (patch) | |
| tree | 61d5f22151b90acb09c8361482ae0db3320cc54e /policy | |
| parent | cefcd81bdb47ca3196fe487e684880d70ff8073c (diff) | |
| parent | bd769a15abfcb23b16daaed10c09029bbb978eef (diff) | |
| download | frameworks_base-1f81973e7d33f2a3f4b0a0e232854283f0f18030.zip frameworks_base-1f81973e7d33f2a3f4b0a0e232854283f0f18030.tar.gz frameworks_base-1f81973e7d33f2a3f4b0a0e232854283f0f18030.tar.bz2 | |
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
Diffstat (limited to 'policy')
| -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 281fde3..f5d43d8 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -3165,7 +3165,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { // If the user is chording a menu shortcut, release the chord since // this window lost focus - if (!hasWindowFocus && mPanelChordingKey != 0) { + if (hasFeature(FEATURE_OPTIONS_PANEL) && !hasWindowFocus && mPanelChordingKey != 0) { closePanel(FEATURE_OPTIONS_PANEL); } |