diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-01-13 19:58:24 -0800 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-01-13 19:58:24 -0800 |
commit | 00ae87d4fd853dd3be9d8820715a98bd72887176 (patch) | |
tree | 923c68d557a3850992b11f0c449bb0064594514c /services | |
parent | 428a731db9a2e5bb273f122cc103ec32ad802f90 (diff) | |
download | frameworks_base-00ae87d4fd853dd3be9d8820715a98bd72887176.zip frameworks_base-00ae87d4fd853dd3be9d8820715a98bd72887176.tar.gz frameworks_base-00ae87d4fd853dd3be9d8820715a98bd72887176.tar.bz2 |
Fix NPE in interceptKeyBeforeDispatching.
Bug: 3349786
Change-Id: Ic2f969ff8a654fdcfeca06199acca531ae5596d3
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 4 |
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); } |