From bd769a15abfcb23b16daaed10c09029bbb978eef Mon Sep 17 00:00:00 2001 From: Jose Lima Date: Wed, 28 Jan 2015 10:43:15 -0800 Subject: 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 --- policy/src/com/android/internal/policy/impl/PhoneWindow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'policy') 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); } -- cgit v1.1