Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c3ab1b8 authored by Andrei Stingaceanu's avatar Andrei Stingaceanu Committed by android-build-merger
Browse files

Merge "Keyboard Shortcuts: protect against NPE in WindowManagerService" into nyc-dev 

am: 2616fbf6

* commit '2616fbf6':
  Keyboard Shortcuts: protect against NPE in WindowManagerService

Change-Id: I8fac6f2f0bbc4540e4b02ec6610d8d82054974f5
parents 83d8678c 2616fbf6

services/core/java/com/android/server/wm/WindowManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -10625,7 +10625,10 @@ public class WindowManagerService extends IWindowManager.Stub 
    @Override

    public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId) {

        try {

            WindowState focusedWindow = getFocusedWindow();

            if (focusedWindow != null && focusedWindow.mClient != null) {

                getFocusedWindow().mClient.requestAppKeyboardShortcuts(receiver, deviceId);

            }

        } catch (RemoteException e) {

        }

    }