diff options
| author | Jose Lima <joselima@google.com> | 2015-01-28 20:59:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-28 20:59:05 +0000 |
| commit | 4a40f7cc90d8f908527d2cfff32376ee51259250 (patch) | |
| tree | ce159c202ef8fd0259e0cfe73ac7398b65739793 /core/java | |
| parent | c71091151636f8276c4d1bffc75b66f90a36c774 (diff) | |
| parent | 1f81973e7d33f2a3f4b0a0e232854283f0f18030 (diff) | |
| download | frameworks_base-4a40f7cc90d8f908527d2cfff32376ee51259250.zip frameworks_base-4a40f7cc90d8f908527d2cfff32376ee51259250.tar.gz frameworks_base-4a40f7cc90d8f908527d2cfff32376ee51259250.tar.bz2 | |
Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev
automerge: 1f81973
* commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030':
Fix crash caused by disabling the Options panel on TVs
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 3 insertions, 1 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); + } } /** |