diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-02 14:56:13 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-12-02 14:56:13 -0800 |
| commit | bf1439c513f0d24a9d23755b50750831574785f4 (patch) | |
| tree | 8c49fb439a2e9427634fc869798f866d42b1469e /services | |
| parent | e1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091 (diff) | |
| parent | c6ded10dd1ee08c887d0e81d683a7611fbe3ca4d (diff) | |
| download | frameworks_base-bf1439c513f0d24a9d23755b50750831574785f4.zip frameworks_base-bf1439c513f0d24a9d23755b50750831574785f4.tar.gz frameworks_base-bf1439c513f0d24a9d23755b50750831574785f4.tar.bz2 | |
Merge "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 dd4aeab..6e1b63a 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -5488,12 +5488,13 @@ public class WindowManagerService extends IWindowManager.Stub int metaState = ev.getMetaState(); int deviceId = ev.getDeviceId(); int scancode = ev.getScanCode(); + int flags = ev.getFlags(); if (eventTime == 0) eventTime = SystemClock.uptimeMillis(); if (downTime == 0) downTime = eventTime; KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState, - deviceId, scancode, KeyEvent.FLAG_FROM_SYSTEM); + deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM); final int pid = Binder.getCallingPid(); final int uid = Binder.getCallingUid(); |