Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 370f01bd authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb

parents 5b907be8 00ae87d4

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }