Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Preserve flags field of event passed to injectKeyEvent()"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-12-02 14:56:13 -08:00
committed by Android Code Review
parent e1de3f390e c6ded10dd1
commit bf1439c513
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/WindowManagerService.java
View File

@@ -5488,12 +5488,13 @@ public class WindowManagerService extends IWindowManager.Stub
int metaState = ev.getMetaState(); int metaState = ev.getMetaState();
int deviceId = ev.getDeviceId(); int deviceId = ev.getDeviceId();
int scancode = ev.getScanCode(); int scancode = ev.getScanCode();
int flags = ev.getFlags();
if (eventTime == 0) eventTime = SystemClock.uptimeMillis(); if (eventTime == 0) eventTime = SystemClock.uptimeMillis();
if (downTime == 0) downTime = eventTime; if (downTime == 0) downTime = eventTime;
KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState, 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 pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();