Projects >> android-frameworks-base-with-screenshot-tweaks >>e0ad63bf1e038dd84ec2502243236f86104f990d

Chunk
Conflicting content 
                        "that you explicitly call close() on your cursor: " +
                        mSqlStmt.substring(0, (len > 100) ? 100 : len), mStackTrace);
            }
<<<<<<< HEAD
=======
            if (StrictMode.vmSqliteObjectLeaksEnabled()) {
                int len = mSqlStmt.length();
                StrictMode.onSqliteObjectLeaked(
                    "Releasing statement in a finalizer. Please ensure " +
                    "that you explicitly call close() on your cursor: " +
                    mSqlStmt.substring(0, (len > 100) ? 100 : len),
                    mStackTrace);
            }
>>>>>>> 6718b365bcce5bd9e67867bd165d771c2226582d
            releaseSqlStatement();
        } finally {
            super.finalize();
Solution content 
                int len = mSqlStmt.length();
                StrictMode.onSqliteObjectLeaked(
                    "Releasing statement in a finalizer. Please ensure " +
                    "that you explicitly call close() on your cursor: " +
                    mSqlStmt.substring(0, (len > 100) ? 100 : len),
                    mStackTrace);
            }
            releaseSqlStatement();
        } finally {
            super.finalize();
File
SQLiteCompiledSql.java
Developer's decision
Combination
Kind of conflict
If statement
Chunk
Conflicting content 
import android.os.Looper;
import android.os.Message;
import android.os.Process;
<<<<<<< HEAD
=======
import android.os.StrictMode;
import android.text.TextUtils;
>>>>>>> 6718b365bcce5bd9e67867bd165d771c2226582d
import android.util.Config;
import android.util.Log;
Solution content 
import android.os.Looper;
import android.os.Message;
import android.os.Process;
import android.os.StrictMode;
import android.util.Config;
import android.util.Log;
File
SQLiteCursor.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        try {
            // if the cursor hasn't been closed yet, close it first
            if (mWindow != null) {
<<<<<<< HEAD
                int len = mQuery.mSql.length();
                Log.e(TAG, "Finalizing a Cursor that has not been deactivated or closed. " +
                        "database = " + mQuery.mDatabase.getPath() + ", table = " + mEditTable +
=======
                if (StrictMode.vmSqliteObjectLeaksEnabled()) {
                    int len = mQuery.mSql.length();
                    StrictMode.onSqliteObjectLeaked(
                        "Finalizing a Cursor that has not been deactivated or closed. " +
                        "database = " + mDatabase.getPath() + ", table = " + mEditTable +
>>>>>>> 6718b365bcce5bd9e67867bd165d771c2226582d
                        ", query = " + mQuery.mSql.substring(0, (len > 100) ? 100 : len),
                        mStackTrace);
                }
Solution content 
        try {
            // if the cursor hasn't been closed yet, close it first
            if (mWindow != null) {
                if (StrictMode.vmSqliteObjectLeaksEnabled()) {
                    int len = mQuery.mSql.length();
                    StrictMode.onSqliteObjectLeaked(
                        "Finalizing a Cursor that has not been deactivated or closed. " +
                        "database = " + mQuery.mDatabase.getPath() + ", table = " + mEditTable +
                        ", query = " + mQuery.mSql.substring(0, (len > 100) ? 100 : len),
                        mStackTrace);
                }
File
SQLiteCursor.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable