diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index eba781890b6e3..08d9ddf559c84 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -10625,7 +10625,10 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId) { try { - getFocusedWindow().mClient.requestAppKeyboardShortcuts(receiver, deviceId); + WindowState focusedWindow = getFocusedWindow(); + if (focusedWindow != null && focusedWindow.mClient != null) { + getFocusedWindow().mClient.requestAppKeyboardShortcuts(receiver, deviceId); + } } catch (RemoteException e) { } }