Projects >> platform_frameworks_base >>4a88013a4a06a9ea80e8419f94694936e6b013f0

Chunk
Conflicting content 
        int metaState = ev.getMetaState();
        int deviceId = ev.getDeviceId();
        int scancode = ev.getScanCode();
<<<<<<< HEAD
        int source = ev.getSource();
        
        if (source == InputDevice.SOURCE_UNKNOWN) {
            source = InputDevice.SOURCE_KEYBOARD;
        }
=======
        int flags = ev.getFlags();
>>>>>>> bf1439c513f0d24a9d23755b50750831574785f4

        if (eventTime == 0) eventTime = SystemClock.uptimeMillis();
        if (downTime == 0) downTime = eventTime;
Solution content 
        int metaState = ev.getMetaState();
        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;
        }

        if (eventTime == 0) eventTime = SystemClock.uptimeMillis();
        if (downTime == 0) downTime = eventTime;
File
WindowManagerService.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
        if (downTime == 0) downTime = eventTime;

        KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState,
<<<<<<< HEAD
                deviceId, scancode, KeyEvent.FLAG_FROM_SYSTEM, source);
=======
                deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM);
>>>>>>> bf1439c513f0d24a9d23755b50750831574785f4

        final int pid = Binder.getCallingPid();
        final int uid = Binder.getCallingUid();
Solution content 
        if (downTime == 0) downTime = eventTime;

        KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState,
                deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM, source);

        final int pid = Binder.getCallingPid();
        final int uid = Binder.getCallingUid();
File
WindowManagerService.java
Developer's decision
Manual
Kind of conflict
Variable