drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master

Browse Source 
* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
  Preserve flags field of event passed to injectKeyEvent()
This commit is contained in:
Jean-Baptiste Queru
2010-12-02 15:21:35 -08:00
committed by Android Git Automerger
parent 5343f5a84e 4a88013a4a
commit a30c12a183
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

@ -5422,6 +5422,7 @@ public class WindowManagerService extends IWindowManager.Stub
int deviceId = ev.getDeviceId(); int deviceId = ev.getDeviceId();
int scancode = ev.getScanCode(); int scancode = ev.getScanCode();
int source = ev.getSource(); int source = ev.getSource();
int flags = ev.getFlags();
if (source == InputDevice.SOURCE_UNKNOWN) { if (source == InputDevice.SOURCE_UNKNOWN) {
source = InputDevice.SOURCE_KEYBOARD; source = InputDevice.SOURCE_KEYBOARD;
@ -5431,7 +5432,7 @@ public class WindowManagerService extends IWindowManager.Stub
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, source); deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM, source);
final int pid = Binder.getCallingPid(); final int pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();