Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd5e8b60 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

* commit 'a30c12a1':
  Preserve flags field of event passed to injectKeyEvent()
parents ded695bb a30c12a1

services/java/com/android/server/WindowManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -6005,6 +6005,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;
@@ -6014,7 +6015,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();