commit 00ae87d4fd853dd3be9d8820715a98bd72887176
author Jeff Brown <jeffbrown@google.com> Thu Jan 13 19:58:24 2011 -0800
committer Jeff Brown <jeffbrown@google.com> Thu Jan 13 19:58:24 2011 -0800
tree 923c68d557a3850992b11f0c449bb0064594514c
parent 428a731db9a2e5bb273f122cc103ec32ad802f90

Fix NPE in interceptKeyBeforeDispatching.

Bug: 3349786
Change-Id: Ic2f969ff8a654fdcfeca06199acca531ae5596d3

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

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