diff options
| -rw-r--r-- | core/java/com/android/internal/policy/DecorView.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index 8e6e63b0e238..c4540f59ebb1 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -2263,8 +2263,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind @Override public void requestKeyboardShortcuts(List<KeyboardShortcutGroup> list, int deviceId) { final PanelFeatureState st = mWindow.getPanelState(FEATURE_OPTIONS_PANEL, false); - if (!mWindow.isDestroyed() && st != null && mWindow.getCallback() != null) { - mWindow.getCallback().onProvideKeyboardShortcuts(list, st.menu, deviceId); + final Menu menu = st != null ? st.menu : null; + if (!mWindow.isDestroyed() && mWindow.getCallback() != null) { + mWindow.getCallback().onProvideKeyboardShortcuts(list, menu, deviceId); } } |