Projects >> frameworks_base_disabled >>bce45617083209583d61afbea50994f2cdcda459

Chunk
Conflicting content 
     */
    public CursorWindow(String name) {
        mStartPos = 0;
<<<<<<< HEAD
        mWindowPtr = nativeCreate(name, sCursorWindowSize);
=======
        mName = name;
        mWindowPtr = nativeCreate(name, sCursorWindowSize, localWindow);
>>>>>>> 2d280f754e32e556407df05d977cfabdfff1c070
        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
Combination
Kind of conflict
Attribute
Method invocation
Variable