Projects >> android-frameworks-base-with-screenshot-tweaks >>816e68e2fddd56c34f864dc5647801117a51720b

Chunk
Conflicting content 
    public CursorWindow(String name) {
        mStartPos = 0;
        mName = name;
<<<<<<< HEAD
        mWindowPtr = nativeCreate(name, sCursorWindowSize);
=======
        mWindowPtr = nativeCreate(name, sCursorWindowSize, localWindow);
>>>>>>> d28bb28e080f1dcd27f5b4f8b697d77cac09495b
        if (mWindowPtr == 0) {
            throw new CursorWindowAllocationException("Cursor window allocation of " +
                    (sCursorWindowSize / 1024) + " kb failed. " + printStats());
Solution content 
    public CursorWindow(String name) {
        mStartPos = 0;
        mName = name;
        mWindowPtr = nativeCreate(name, sCursorWindowSize);
        if (mWindowPtr == 0) {
            throw new CursorWindowAllocationException("Cursor window allocation of " +
                    (sCursorWindowSize / 1024) + " kb failed. " + printStats());
File
CursorWindow.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation