diff options
| author | Jose Lima <joselima@google.com> | 2015-01-28 10:43:15 -0800 |
|---|---|---|
| committer | Jose Lima <joselima@google.com> | 2015-01-28 10:46:39 -0800 |
| commit | bd769a15abfcb23b16daaed10c09029bbb978eef (patch) | |
| tree | 61d5f22151b90acb09c8361482ae0db3320cc54e /core/java/android/app | |
| parent | 1061652a37e18683c994f9d4b872ecf990125a05 (diff) | |
| download | frameworks_base-bd769a15abfcb23b16daaed10c09029bbb978eef.zip frameworks_base-bd769a15abfcb23b16daaed10c09029bbb978eef.tar.gz frameworks_base-bd769a15abfcb23b16daaed10c09029bbb978eef.tar.bz2 | |
Fix crash caused by disabling the Options panel on TVs
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.
Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
Diffstat (limited to 'core/java/android/app')
| -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); + } } /** |