From 936f27cbf73b335c7a1404af8406baa0f3576e05 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Tue, 11 Apr 2017 23:23:42 +0100 Subject: [PATCH] Always request keyboard shorcuts, even if there's no menu. Bug: 36964520 Test: cts-tradefed run cts-dev --module CtsAppTestCases -t android.app.cts.ActivityKeyboardShortcutsTest#testRequestShowKeyboardShortcuts Change-Id: Idc2224260470dfd58a08cd8b2df5d8de67fbaea4 --- core/java/com/android/internal/policy/DecorView.java | 5 +++-- 1 file 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 8e6e63b0e2381..c4540f59ebb12 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 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); } }