Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fc46c62 authored by Vasu Nori's avatar Vasu Nori Committed by Android (Google) Code Review
Browse files

Merge "accept close() on database objects even if the database is closed" into froyo

parents d5a873fb 0dbb9cee

core/java/android/database/sqlite/SQLiteCompiledSql.java

+0 −3
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ import android.util.Log; 
    }



    /* package */ void releaseSqlStatement() {

        if (!mDatabase.isOpen()) {

            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");

        }

        // Note that native_finalize() checks to make sure that nStatement is

        // non-null before destroying it.

        if (nStatement != 0) {

core/java/android/database/sqlite/SQLiteProgram.java

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public abstract class SQLiteProgram extends SQLiteClosable { 
     */

    public void close() {

        if (!mDatabase.isOpen()) {

            throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");

            return;

        }

        mDatabase.lock();

        try {