Projects >> platform_frameworks_base >>3b335078e8a6fe3e2045ad081785f139d5991786

Chunk
Conflicting content 
        mLast.prev = mFirst;
    }

<<<<<<< HEAD
        if (! WindowManagerService.ENABLE_NATIVE_INPUT_DISPATCH) {
            mThread.start();
        }
=======
    void start() {
        mThread.start();
>>>>>>> 3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec
    }

    public void setDisplay(Display display) {
Solution content 
        mLast.prev = mFirst;

        if (! WindowManagerService.ENABLE_NATIVE_INPUT_DISPATCH) {
            mThread.start();
        }
    }

    public void setDisplay(Display display) {
File
KeyInputQueue.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Method signature
Chunk
Conflicting content 
            }
        }

<<<<<<< HEAD
        if (ENABLE_NATIVE_INPUT_DISPATCH) {
            mInputManager.start();
        } else {
            mInputThread.start();
        }
=======
        mInputThread.start();
        mQueue.start();
>>>>>>> 3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec

        // Add ourself to the Watchdog monitors.
        Watchdog.getInstance().addMonitor(this);
Solution content 
            }
        }

        if (ENABLE_NATIVE_INPUT_DISPATCH) {
            mInputManager.start();
        } else {
            mInputThread.start();
        }

        // Add ourself to the Watchdog monitors.
        Watchdog.getInstance().addMonitor(this);
File
WindowManagerService.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation