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

Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb

Browse Source
This commit is contained in:
Jeff Brown
2011-01-13 20:00:31 -08:00
committed by Android (Google) Code Review
parent 5b907be8f5 00ae87d4fd
commit 370f01bd42
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. */ * ordinary dispatch. */
public boolean interceptKeyBeforeDispatching( public boolean interceptKeyBeforeDispatching(
InputWindowHandle focus, KeyEvent event, int policyFlags) { 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); return mPolicy.interceptKeyBeforeDispatching(windowState, event, policyFlags);
} }
@@ -6002,7 +6002,7 @@ public class WindowManagerService extends IWindowManager.Stub
* the application did not handle. */ * the application did not handle. */
public KeyEvent dispatchUnhandledKey( public KeyEvent dispatchUnhandledKey(
InputWindowHandle focus, KeyEvent event, int policyFlags) { 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); return mPolicy.dispatchUnhandledKey(windowState, event, policyFlags);
} }