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 /core/java | |
| 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
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); + } } /** |