Projects information

Chunk

Conflicting content
public Cursor rawQueryWithFactory( CursorFactory cursorFactory, String sql, String[] selectionArgs, String editTable) { <<<<<<< HEAD verifyDbIsOpen(); ======= if (!isOpen()) { throw new IllegalStateException("database not open"); } BlockGuard.getThreadPolicy().onReadFromDisk(); >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac long timeStart = 0; if (Config.LOGV \|\| mSlowQueryThreshold != -1) {

Conflicting content

    public Cursor rawQueryWithFactory(
            CursorFactory cursorFactory, String sql, String[] selectionArgs,
            String editTable) {
<<<<<<< HEAD
        verifyDbIsOpen();
=======
        if (!isOpen()) {
            throw new IllegalStateException("database not open");
        }
        BlockGuard.getThreadPolicy().onReadFromDisk();
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac
        long timeStart = 0;

        if (Config.LOGV || mSlowQueryThreshold != -1) {

Solution content
public Cursor rawQueryWithFactory( CursorFactory cursorFactory, String sql, String[] selectionArgs, String editTable) { verifyDbIsOpen(); BlockGuard.getThreadPolicy().onReadFromDisk(); long timeStart = 0; if (Config.LOGV \|\| mSlowQueryThreshold != -1) {

Solution content

    public Cursor rawQueryWithFactory(
            CursorFactory cursorFactory, String sql, String[] selectionArgs,
            String editTable) {
        verifyDbIsOpen();
        BlockGuard.getThreadPolicy().onReadFromDisk();
        long timeStart = 0;

        if (Config.LOGV || mSlowQueryThreshold != -1) {

File
SQLiteDatabase.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
*/ public long insertWithOnConflict(String table, String nullColumnHack, ContentValues initialValues, int conflictAlgorithm) { <<<<<<< HEAD verifyDbIsOpen(); ======= BlockGuard.getThreadPolicy().onWriteToDisk(); if (!isOpen()) { throw new IllegalStateException("database not open"); } >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac // Measurements show most sql lengths <= 152 StringBuilder sql = new StringBuilder(152);

Conflicting content

     */
    public long insertWithOnConflict(String table, String nullColumnHack,
            ContentValues initialValues, int conflictAlgorithm) {
<<<<<<< HEAD
        verifyDbIsOpen();
=======
        BlockGuard.getThreadPolicy().onWriteToDisk();
        if (!isOpen()) {
            throw new IllegalStateException("database not open");
        }
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac

        // Measurements show most sql lengths <= 152
        StringBuilder sql = new StringBuilder(152);

Solution content
*/ public long insertWithOnConflict(String table, String nullColumnHack, ContentValues initialValues, int conflictAlgorithm) { verifyDbIsOpen(); BlockGuard.getThreadPolicy().onWriteToDisk(); // Measurements show most sql lengths <= 152 StringBuilder sql = new StringBuilder(152);

Solution content

     */
    public long insertWithOnConflict(String table, String nullColumnHack,
            ContentValues initialValues, int conflictAlgorithm) {
        verifyDbIsOpen();
        BlockGuard.getThreadPolicy().onWriteToDisk();

        // Measurements show most sql lengths <= 152
        StringBuilder sql = new StringBuilder(152);

File
SQLiteDatabase.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
* whereClause. */ public int delete(String table, String whereClause, String[] whereArgs) { <<<<<<< HEAD verifyDbIsOpen(); ======= BlockGuard.getThreadPolicy().onWriteToDisk(); >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac lock(); SQLiteStatement statement = null; try {

Conflicting content

     *         whereClause.
     */
    public int delete(String table, String whereClause, String[] whereArgs) {
<<<<<<< HEAD
        verifyDbIsOpen();
=======
        BlockGuard.getThreadPolicy().onWriteToDisk();
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac
        lock();
        SQLiteStatement statement = null;
        try {

Solution content
* whereClause. */ public int delete(String table, String whereClause, String[] whereArgs) { verifyDbIsOpen(); BlockGuard.getThreadPolicy().onWriteToDisk(); lock(); SQLiteStatement statement = null; try {

Solution content

     *         whereClause.
     */
    public int delete(String table, String whereClause, String[] whereArgs) {
        verifyDbIsOpen();
        BlockGuard.getThreadPolicy().onWriteToDisk();
        lock();
        SQLiteStatement statement = null;
        try {

File
SQLiteDatabase.java

Developer's decision
Concatenation

Kind of conflict
Method invocation

Chunk

Conflicting content
* @throws SQLException If the SQL string is invalid for some reason */ public void execSQL(String sql) throws SQLException { <<<<<<< HEAD verifyDbIsOpen(); ======= BlockGuard.getThreadPolicy().onWriteToDisk(); >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac long timeStart = SystemClock.uptimeMillis(); lock(); logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX);

Conflicting content

     * @throws SQLException If the SQL string is invalid for some reason
     */
    public void execSQL(String sql) throws SQLException {
<<<<<<< HEAD
        verifyDbIsOpen();
=======
        BlockGuard.getThreadPolicy().onWriteToDisk();
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac
        long timeStart = SystemClock.uptimeMillis();
        lock();
        logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX);

Solution content
* @throws SQLException If the SQL string is invalid for some reason */ public void execSQL(String sql) throws SQLException { verifyDbIsOpen(); BlockGuard.getThreadPolicy().onWriteToDisk(); long timeStart = SystemClock.uptimeMillis(); lock(); logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX);

Solution content

     * @throws SQLException If the SQL string is invalid for some reason
     */
    public void execSQL(String sql) throws SQLException {
        verifyDbIsOpen();
        BlockGuard.getThreadPolicy().onWriteToDisk();
        long timeStart = SystemClock.uptimeMillis();
        lock();
        logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX);

File
SQLiteDatabase.java

Developer's decision
Concatenation

Kind of conflict
Method invocation

Chunk

Conflicting content
* some reason */ public void execute() { <<<<<<< HEAD mDatabase.verifyDbIsOpen(); ======= BlockGuard.getThreadPolicy().onWriteToDisk(); if (!mDatabase.isOpen()) { throw new IllegalStateException("database " + mDatabase.getPath() + " already closed"); } >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

Conflicting content

     *         some reason
     */
    public void execute() {
<<<<<<< HEAD
        mDatabase.verifyDbIsOpen();
=======
        BlockGuard.getThreadPolicy().onWriteToDisk();
        if (!mDatabase.isOpen()) {
            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
        }
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac
        long timeStart = SystemClock.uptimeMillis();
        mDatabase.lock();

Solution content
* some reason */ public void execute() { mDatabase.verifyDbIsOpen(); BlockGuard.getThreadPolicy().onWriteToDisk(); long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

File
SQLiteStatement.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
* some reason */ public long executeInsert() { <<<<<<< HEAD mDatabase.verifyDbIsOpen(); ======= BlockGuard.getThreadPolicy().onWriteToDisk(); if (!mDatabase.isOpen()) { throw new IllegalStateException("database " + mDatabase.getPath() + " already closed"); } >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

Conflicting content

     *         some reason
     */
    public long executeInsert() {
<<<<<<< HEAD
        mDatabase.verifyDbIsOpen();
=======
        BlockGuard.getThreadPolicy().onWriteToDisk();
        if (!mDatabase.isOpen()) {
            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
        }
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac
        long timeStart = SystemClock.uptimeMillis();
        mDatabase.lock();

Solution content
* some reason */ public long executeInsert() { mDatabase.verifyDbIsOpen(); BlockGuard.getThreadPolicy().onWriteToDisk(); long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

File
SQLiteStatement.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
* @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows */ public long simpleQueryForLong() { <<<<<<< HEAD mDatabase.verifyDbIsOpen(); ======= BlockGuard.getThreadPolicy().onReadFromDisk(); if (!mDatabase.isOpen()) { throw new IllegalStateException("database " + mDatabase.getPath() + " already closed"); } >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

Conflicting content

     * @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows
     */
    public long simpleQueryForLong() {
<<<<<<< HEAD
        mDatabase.verifyDbIsOpen();
=======
        BlockGuard.getThreadPolicy().onReadFromDisk();
        if (!mDatabase.isOpen()) {
            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
        }
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac
        long timeStart = SystemClock.uptimeMillis();
        mDatabase.lock();

Solution content
* @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows */ public long simpleQueryForLong() { mDatabase.verifyDbIsOpen(); BlockGuard.getThreadPolicy().onReadFromDisk(); long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

Solution content

     * @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows
     */
    public long simpleQueryForLong() {
        mDatabase.verifyDbIsOpen();
        BlockGuard.getThreadPolicy().onReadFromDisk();
        long timeStart = SystemClock.uptimeMillis();
        mDatabase.lock();

File
SQLiteStatement.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
* @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows */ public String simpleQueryForString() { <<<<<<< HEAD mDatabase.verifyDbIsOpen(); ======= BlockGuard.getThreadPolicy().onReadFromDisk(); if (!mDatabase.isOpen()) { throw new IllegalStateException("database " + mDatabase.getPath() + " already closed"); } >>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

Conflicting content

     * @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows
     */
    public String simpleQueryForString() {
<<<<<<< HEAD
        mDatabase.verifyDbIsOpen();
=======
        BlockGuard.getThreadPolicy().onReadFromDisk();
        if (!mDatabase.isOpen()) {
            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
        }
>>>>>>> 7d6362de0645470f3b02176b1e06660149f872ac
        long timeStart = SystemClock.uptimeMillis();
        mDatabase.lock();

Solution content
* @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows */ public String simpleQueryForString() { mDatabase.verifyDbIsOpen(); BlockGuard.getThreadPolicy().onReadFromDisk(); long timeStart = SystemClock.uptimeMillis(); mDatabase.lock();

Solution content

     * @throws android.database.sqlite.SQLiteDoneException if the query returns zero rows
     */
    public String simpleQueryForString() {
        mDatabase.verifyDbIsOpen();
        BlockGuard.getThreadPolicy().onReadFromDisk();
        long timeStart = SystemClock.uptimeMillis();
        mDatabase.lock();

File
SQLiteStatement.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Projects >> android-frameworks-base-with-remote-control-service >>e407a608b0e2c7aad5cd6321426ec85d35f3bafa