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

Commit 66bee813 authored by Vasu Nori's avatar Vasu Nori Committed by Android Git Automerger
Browse files

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

Merge commit '1fc46c62' into froyo-plus-aosp

* commit '1fc46c62':
  accept close() on database objects even if the database is closed
parents cb2906e4 1fc46c62

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 {