Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrei Stingaceanu
2016-04-06 14:26:03 +00:00
committed by Android (Google) Code Review
parent 7f2bc45330 f671147434
commit 2616fbf631
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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) {
}
}