Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb

1 files changed, 2 insertions, 2 deletions

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 182e898..6ce6d3b 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -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);
         }