diff options
| author | Jose Lima <joselima@google.com> | 2015-01-28 21:27:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 21:27:33 +0000 |
| commit | 485f6a60e0182767d57a5ab08d6438124a69439e (patch) | |
| tree | 7877fbab9dc55ec405f3e529539870e041d7de68 | |
| parent | 1334d5cfb4e6bd2fca95a8ca2d5bb583a4ef2923 (diff) | |
| parent | 4a40f7cc90d8f908527d2cfff32376ee51259250 (diff) | |
| download | frameworks_base-485f6a60e0182767d57a5ab08d6438124a69439e.zip frameworks_base-485f6a60e0182767d57a5ab08d6438124a69439e.tar.gz frameworks_base-485f6a60e0182767d57a5ab08d6438124a69439e.tar.bz2 | |
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
Fix crash caused by disabling the Options panel on TVs
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index d33c82b..9568897 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -3230,7 +3230,9 @@ public class Activity extends ContextThemeWrapper * Programmatically closes the most recently opened context menu, if showing. */ public void closeContextMenu() { - mWindow.closePanel(Window.FEATURE_CONTEXT_MENU); + if (mWindow.hasFeature(Window.FEATURE_CONTEXT_MENU)) { + mWindow.closePanel(Window.FEATURE_CONTEXT_MENU); + } } /** 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); } |