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

am 370f01bd: Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb

Browse Source 
* commit '370f01bd42377dc1b150fa09515c4871ab763698':
  Fix NPE in interceptKeyBeforeDispatching.
This commit is contained in:
Jeff Brown
2011-01-13 20:02:35 -08:00
committed by Android Git Automerger
parent bd04922f8f 370f01bd42
commit 4f7a2d45f4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/WindowManagerService.java
View File

@@ -5994,7 +5994,7 @@ public class WindowManagerService extends IWindowManager.Stub
* ordinary dispatch. */
public boolean interceptKeyBeforeDispatching(
InputWindowHandle focus, KeyEvent event, int policyFlags) {
WindowState windowState = (WindowState) focus.windowState;
WindowState windowState = focus != null ? (WindowState) focus.windowState : null;
return mPolicy.interceptKeyBeforeDispatching(windowState, event, policyFlags);
}
@@ -6002,7 +6002,7 @@ public class WindowManagerService extends IWindowManager.Stub
* the application did not handle. */
public KeyEvent dispatchUnhandledKey(
InputWindowHandle focus, KeyEvent event, int policyFlags) {
WindowState windowState = (WindowState) focus.windowState;
WindowState windowState = focus != null ? (WindowState) focus.windowState : null;
return mPolicy.dispatchUnhandledKey(windowState, event, policyFlags);
}