2 files changed, 20 insertions, 27 deletions
diff --git a/services/java/com/android/server/InputManager.java b/services/java/com/android/server/InputManager.java
index 30b49d3..9078811 100644
--- a/services/java/com/android/server/InputManager.java
+++ b/services/java/com/android/server/InputManager.java
@@ -30,6 +30,7 @@ import android.util.Xml;
 import android.view.InputChannel;
 import android.view.InputDevice;
 import android.view.InputEvent;
+import android.view.KeyEvent;
 import android.view.Surface;
 
 import java.io.BufferedReader;
@@ -398,26 +399,23 @@ public class InputManager {
         }
         
         @SuppressWarnings("unused")
-        public int interceptKeyBeforeQueueing(long whenNanos, int action, int flags,
-                int keyCode, int scanCode, int policyFlags, boolean isScreenOn) {
+        public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags, boolean isScreenOn) {
             return mWindowManagerService.mInputMonitor.interceptKeyBeforeQueueing(
-                    whenNanos, action, flags, keyCode, scanCode, policyFlags, isScreenOn);
+                    event, policyFlags, isScreenOn);
         }
         
         @SuppressWarnings("unused")
-        public boolean interceptKeyBeforeDispatching(InputChannel focus, int action,
-                int flags, int keyCode, int scanCode, int metaState, int repeatCount,
-                int policyFlags) {
-            return mWindowManagerService.mInputMonitor.interceptKeyBeforeDispatching(focus,
-                    action, flags, keyCode, scanCode, metaState, repeatCount, policyFlags);
+        public boolean interceptKeyBeforeDispatching(InputChannel focus,
+                KeyEvent event, int policyFlags) {
+            return mWindowManagerService.mInputMonitor.interceptKeyBeforeDispatching(
+                    focus, event, policyFlags);
         }
         
         @SuppressWarnings("unused")
-        public boolean dispatchUnhandledKey(InputChannel focus, int action,
-                int flags, int keyCode, int scanCode, int metaState, int repeatCount,
-                int policyFlags) {
-            return mWindowManagerService.mInputMonitor.dispatchUnhandledKey(focus,
-                    action, flags, keyCode, scanCode, metaState, repeatCount, policyFlags);
+        public boolean dispatchUnhandledKey(InputChannel focus,
+                KeyEvent event, int policyFlags) {
+            return mWindowManagerService.mInputMonitor.dispatchUnhandledKey(
+                    focus, event, policyFlags);
         }
         
         @SuppressWarnings("unused")
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index cbb35c6..5e49404 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -5829,30 +5829,25 @@ public class WindowManagerService extends IWindowManager.Stub
         
         /* Provides an opportunity for the window manager policy to intercept early key
          * processing as soon as the key has been read from the device. */
-        public int interceptKeyBeforeQueueing(long whenNanos, int action, int flags,
-                int keyCode, int scanCode, int policyFlags, boolean isScreenOn) {
-            return mPolicy.interceptKeyBeforeQueueing(whenNanos, action, flags,
-                    keyCode, scanCode, policyFlags, isScreenOn);
+        public int interceptKeyBeforeQueueing(
+                KeyEvent event, int policyFlags, boolean isScreenOn) {
+            return mPolicy.interceptKeyBeforeQueueing(event, policyFlags, isScreenOn);
         }
         
         /* Provides an opportunity for the window manager policy to process a key before
          * ordinary dispatch. */
-        public boolean interceptKeyBeforeDispatching(InputChannel focus,
-                int action, int flags, int keyCode, int scanCode, int metaState, int repeatCount,
-                int policyFlags) {
+        public boolean interceptKeyBeforeDispatching(
+                InputChannel focus, KeyEvent event, int policyFlags) {
             WindowState windowState = getWindowStateForInputChannel(focus);
-            return mPolicy.interceptKeyBeforeDispatching(windowState, action, flags,
-                    keyCode, scanCode, metaState, repeatCount, policyFlags);
+            return mPolicy.interceptKeyBeforeDispatching(windowState, event, policyFlags);
         }
         
         /* Provides an opportunity for the window manager policy to process a key that
          * the application did not handle. */
-        public boolean dispatchUnhandledKey(InputChannel focus,
-                int action, int flags, int keyCode, int scanCode, int metaState, int repeatCount,
-                int policyFlags) {
+        public boolean dispatchUnhandledKey(
+                InputChannel focus, KeyEvent event, int policyFlags) {
             WindowState windowState = getWindowStateForInputChannel(focus);
-            return mPolicy.dispatchUnhandledKey(windowState, action, flags,
-                    keyCode, scanCode, metaState, repeatCount, policyFlags);
+            return mPolicy.dispatchUnhandledKey(windowState, event, policyFlags);
         }
         
         /* Called when the current input focus changes.