diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-02 15:21:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-02 15:21:35 -0800 |
| commit | a30c12a18326ed4d608382cd4f970a6e15a58bf5 (patch) | |
| tree | dc5cefae5210228bcd0b2bce08d70f00056cd1c8 /services | |
| parent | 5343f5a84e66cc0806d20c16b96e612e80131ac2 (diff) | |
| parent | 4a88013a4a06a9ea80e8419f94694936e6b013f0 (diff) | |
| download | frameworks_base-a30c12a18326ed4d608382cd4f970a6e15a58bf5.zip frameworks_base-a30c12a18326ed4d608382cd4f970a6e15a58bf5.tar.gz frameworks_base-a30c12a18326ed4d608382cd4f970a6e15a58bf5.tar.bz2 | |
am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master
* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
Preserve flags field of event passed to injectKeyEvent()
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class WindowManagerService extends IWindowManager.Stub 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 @@ public class WindowManagerService extends IWindowManager.Stub 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(); |