commit 4a88013a4a06a9ea80e8419f94694936e6b013f0
author Jean-Baptiste Queru <jbq@google.com> Thu Dec 02 15:16:53 2010 -0800
committer Jean-Baptiste Queru <jbq@google.com> Thu Dec 02 15:16:53 2010 -0800
tree e577b5f10df205463a542d7de841320958bf8c78
parent 40eade14bb87d24903588de04449fdfe2e1795cb
parent bf1439c513f0d24a9d23755b50750831574785f4

resolved conflicts for merge of bf1439c5 to stage-korg-master

Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99

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 9ca53c6..83d65fa 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -5422,6 +5422,7 @@
         int deviceId = ev.getDeviceId();
         int scancode = ev.getScanCode();
         int source = ev.getSource();
+        int flags = ev.getFlags();
         
         if (source == InputDevice.SOURCE_UNKNOWN) {
             source = InputDevice.SOURCE_KEYBOARD;
@@ -5431,7 +5432,7 @@
         if (downTime == 0) downTime = eventTime;
 
         KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState,
-                deviceId, scancode, KeyEvent.FLAG_FROM_SYSTEM, source);
+                deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM, source);
 
         final int pid = Binder.getCallingPid();
         final int uid = Binder.getCallingUid();